firmware-imx: refactory package naming and version

Rename the 'imx-firmware' package to 'firmware-imx' as this is how the
tarball is named. We also changed the version from 0.1 to 11.09.01 to
proper reflect to the version in use.

During the refactory the package upgrade path has been respected so
package management can know how to handle the rename.

Change-Id: I8d908020333883d7c8a42641e6d9a6e3e81f4bb0
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

5 files changed, 12 insertions, 4 deletions

diff --git a/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware_0.1.bb b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx.inc
index 5d636058..926e7227 100644
--- a/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware_0.1.bb
+++ b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx.inc
@@ -3,16 +3,15 @@ DESCRIPTION = "Freescale IMX firmware such as for the VPU"
 SECTION = "base"
 LICENSE = "Freescale"
 LIC_FILES_CHKSUM = "file://licenses/vpu/EULA;md5=6469a8514eed615d6bf8c09f41846d8f"
-PR = "r4"
 
-SRC_URI = "file://firmware-imx-11.09.01.tar.gz \
+INC_PR = "r0"
+
+SRC_URI = "file://firmware-imx-${PV}.tar.gz \
            file://vpu_fw_imx51.bin \
            file://vpu_fw_imx53.bin"
 
 COMPATIBLE_MACHINE = "(mx5)"
 
-S = "${WORKDIR}/firmware-imx-11.09.01"
-
 # todo: make FILES_ machine dependent using override, i.MX53 only now.
 FILES_${PN} = "/lib/firmware/vpu/vpu_fw_imx53.bin"
 FILES_${PN} += "/lib/firmware/sdma/sdma-imx53-to1.bin"
@@ -35,3 +34,7 @@ do_install() {
         cp -rf ${S}/firmware/ar3k ${D}/lib/firmware
 }
 
+# Add an upgrade path
+RPROVIDES_${PN} = "imx-firmware"
+RREPLACES_${PN} = "imx-firmware"
+RCONFLICTS_${PN} = "imx-firmware"
diff --git a/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware/firmware-imx-11.09.01.tar.gz b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx/firmware-imx-11.09.01.tar.gz
index a83e9d11..a83e9d11 100644
--- a/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware/firmware-imx-11.09.01.tar.gz
+++ b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx/firmware-imx-11.09.01.tar.gz
diff --git a/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware/vpu_fw_imx51.bin b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx51.bin
index 9a2dcf5f..9a2dcf5f 100644
--- a/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware/vpu_fw_imx51.bin
+++ b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx51.bin
diff --git a/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware/vpu_fw_imx53.bin b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx53.bin
index b9d70f72..b9d70f72 100644
--- a/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware/vpu_fw_imx53.bin
+++ b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx53.bin
diff --git a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_11.09.01.bb b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_11.09.01.bb
new file mode 100644
index 00000000..ea75e1d4
--- /dev/null
+++ b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_11.09.01.bb
@@ -0,0 +1,5 @@
+require firmware-imx.inc
+
+PR = "${INC_PR}.0"
+
+COMPATIBLE_MACHINE = "(mx5)"