3 files changed, 19 insertions, 10 deletions

diff --git a/recipes-bsp/firmware-imx/firmware-imx.inc b/recipes-bsp/firmware-imx/firmware-imx.inc
index 558c62464..fc49669d9 100644
--- a/recipes-bsp/firmware-imx/firmware-imx.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx.inc
@@ -11,12 +11,17 @@ SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true"
 inherit fsl-eula-unpack
 
 do_install() {
-    install -d ${D}/lib/firmware
+    install -d ${D}/lib/firmware/imx
     cp -rfv firmware/* ${D}/lib/firmware/
+
+    mv ${D}/lib/firmware/epdc/ ${D}/lib/firmware/imx/epdc/
+    mv ${D}/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted ${D}/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw
+
     find ${D}/lib/firmware -type f -exec chmod 644 '{}' ';'
+    find ${D}/lib/firmware -type f -exec chown root:root '{}' ';'
 
     # Remove files not going to be installed
-    find ${D}/lib/firmware/ -name Android.mk -exec rm '{}' ';'
+    find ${D}/lib/firmware/ -name '*.mk' -exec rm '{}' ';'
 }
 
 python populate_packages_prepend() {
@@ -39,4 +44,8 @@ ALLOW_EMPTY_${PN} = "1"
 
 PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-*"
 
+PACKAGES =+ "${PN}-epdc"
+
+FILES_${PN}-epdc = "/lib/firmware/imx/epdc/"
+
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
diff --git a/recipes-bsp/firmware-imx/firmware-imx_5.0.bb b/recipes-bsp/firmware-imx/firmware-imx_5.0.bb
deleted file mode 100644
index cb1311016..000000000
--- a/recipes-bsp/firmware-imx/firmware-imx_5.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (C) 2012-2015 Freescale Semiconductor
-
-require firmware-imx.inc
-
-SRC_URI[md5sum] = "543210d17971f61c7c1829d2c160dc4e"
-SRC_URI[sha256sum] = "6c1a383d6f40ae79f7da85584fdf90a6718538bc87f02c3037bcd6b8cb748483"
-
-COMPATIBLE_MACHINE = "(mx5|mx6)"
diff --git a/recipes-bsp/firmware-imx/firmware-imx_5.2.bb b/recipes-bsp/firmware-imx/firmware-imx_5.2.bb
new file mode 100644
index 000000000..f8a085139
--- /dev/null
+++ b/recipes-bsp/firmware-imx/firmware-imx_5.2.bb
@@ -0,0 +1,8 @@
+# Copyright (C) 2012-2015 Freescale Semiconductor
+
+require recipes-bsp/firmware-imx/firmware-imx.inc
+
+SRC_URI[md5sum] = "e466839e2cfbbcacb974b872c0b063e7"
+SRC_URI[sha256sum] = "8cc2df128c0e2d2f5224d73389fbe6e4d6fa9ede76f8c0a9adaf7ec0986d0f1f"
+
+COMPATIBLE_MACHINE = "(mx5|mx6|mx7)"