From f5baea35b20f156abf90246a7d49c8b7fc2957d0 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Thu, 14 Aug 2014 14:01:23 +0200
Subject: colibri-imx6: refactor recipes for new module

---
 recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb  |  7 ++++---
 recipes-kernel/linux/linux-toradex-fsl_git.bb | 10 +++++-----
 recipes/images/angstrom-lxde-image.bb         |  1 +
 recipes/images/angstrom-qt-x11-image.bb       |  1 +
 recipes/images/console-trdx-image.bb          |  1 +
 recipes/images/trdx-image-fstype.inc          |  4 ++--
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
index 34b9a26..b833288 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
@@ -12,16 +12,17 @@ S = "${WORKDIR}/git"
 
 SRCREV_colibri-vf = "36b44c6fc7ddde29aec7f39ebcb5cc959d24b469"
 SRCBRANCH_colibri-vf = "2014.04-toradex"
-SRCREV_apalis-imx6 = "36b44c6fc7ddde29aec7f39ebcb5cc959d24b469"
-SRCBRANCH_apalis-imx6 = "2014.04-toradex"
+SRCREV_mx6 = "36b44c6fc7ddde29aec7f39ebcb5cc959d24b469"
+SRCBRANCH_mx6 = "2014.04-toradex"
 SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=${SRCBRANCH}"
 
 #FILESPATHPKG =. "git:"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-COMPATIBLE_MACHINE = "(colibri-vf|apalis-imx6)"
+COMPATIBLE_MACHINE = "(colibri-vf|colibri-imx6|apalis-imx6)"
 DEFAULT_PREFERENCE_colibri-vf = "1"
 DEFAULT_PREFERENCE_apalis-imx6 = "1"
+DEFAULT_PREFERENCE_colibri-imx6 = "1"
 
 # colibri_vf: copy additional U-Boot binary for NAND
 UBOOT_BINARY_NAND_colibri-vf = "u-boot-nand.imx"
diff --git a/recipes-kernel/linux/linux-toradex-fsl_git.bb b/recipes-kernel/linux/linux-toradex-fsl_git.bb
index d653f26..fc88680 100644
--- a/recipes-kernel/linux/linux-toradex-fsl_git.bb
+++ b/recipes-kernel/linux/linux-toradex-fsl_git.bb
@@ -10,22 +10,22 @@ require recipes-kernel/linux/linux-dtb.inc
 DEPENDS += "lzop-native "
 
 LINUX_VERSION_colibri-vf = "3.0.15"
-LINUX_VERSION_apalis-imx6 = "3.10.17"
+LINUX_VERSION_mx6 = "3.10.17"
 
 SRCREV_colibri-vf = "1d876acfd2cd445fe46e5bc4c531da2c6bef0c91"
 PR_colibri-vf = "V2.3b1"
-SRCREV_apalis-imx6 = "485787d21c9ddefb9f992bf5190e9c4b8d9154b4"
-PR_apalis-imx6 = "V2.3b1"
+SRCREV_mx6 = "485787d21c9ddefb9f992bf5190e9c4b8d9154b4"
+PR_mx6 = "V2.3b1"
 
 PV = "${LINUX_VERSION}+gitr${SRCREV}"
 S = "${WORKDIR}/git"
 SRCBRANCH_colibri-vf = "colibri_vf"
-SRCBRANCH_apalis-imx6 = "toradex_imx_3.10.17_1.0.0_ga"
+SRCBRANCH_mx6 = "toradex_imx_3.10.17_1.0.0_ga"
 SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRANCH}"
 # a Patch
 # SRC_URI_append_mx6 += "file://a.patch "
 
-COMPATIBLE_MACHINE = "(colibri-vf|apalis-imx6)"
+COMPATIBLE_MACHINE = "(colibri-vf|colibri-imx6|apalis-imx6)"
 
 # Place changes to the defconfig here
 config_script () {
diff --git a/recipes/images/angstrom-lxde-image.bb b/recipes/images/angstrom-lxde-image.bb
index 4f1dcab..48d3abf 100644
--- a/recipes/images/angstrom-lxde-image.bb
+++ b/recipes/images/angstrom-lxde-image.bb
@@ -12,6 +12,7 @@ IMAGE_NAME_colibri-t30 = "Colibri_T30_LinuxImage"
 IMAGE_NAME_apalis-t30 = "Apalis_T30_LinuxImage"
 IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxImage"
 IMAGE_NAME_colibri-vf = "Colibri_VF_LinuxImage"
+IMAGE_NAME_colibri-imx6 = "Colibri_iMX6_LinuxImage"
 IMAGE_NAME_apalis-imx6 = "Apalis_iMX6_LinuxImage"
 IMAGE_NAME = "${MACHINE}_LinuxImage"
 
diff --git a/recipes/images/angstrom-qt-x11-image.bb b/recipes/images/angstrom-qt-x11-image.bb
index 021d474..31d9601 100644
--- a/recipes/images/angstrom-qt-x11-image.bb
+++ b/recipes/images/angstrom-qt-x11-image.bb
@@ -11,6 +11,7 @@ IMAGE_NAME_colibri-t20 = "Colibri_T20_LinuxImage-qt"
 IMAGE_NAME_colibri-t30 = "Colibri_T30_LinuxImage-qt"
 IMAGE_NAME_apalis-t30 = "Apalis_T30_LinuxImage-qt"
 IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxImage-qt"
+IMAGE_NAME_colibri-imx6 = "Colibri_iMX6_LinuxImage-qt"
 IMAGE_NAME_apalis-imx6 = "Apalis_iMX6_LinuxImage-qt"
 IMAGE_NAME = "${MACHINE}_LinuxImage-qt"
 
diff --git a/recipes/images/console-trdx-image.bb b/recipes/images/console-trdx-image.bb
index 700f07e..689ba09 100644
--- a/recipes/images/console-trdx-image.bb
+++ b/recipes/images/console-trdx-image.bb
@@ -12,6 +12,7 @@ IMAGE_NAME_colibri-t30 = "Colibri_T30_LinuxConsoleImage"
 IMAGE_NAME_apalis-t30 = "Apalis_T30_LinuxConsoleImage"
 IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxConsoleImage"
 IMAGE_NAME_colibri-vf = "Colibri_VF_LinuxConsoleImage"
+IMAGE_NAME_colibri-imx6 = "Colibri_iMX6_LinuxConsoleImage"
 IMAGE_NAME_apalis-imx6 = "Apalis_iMX6_LinuxConsoleImage"
 IMAGE_NAME = "${MACHINE}_LinuxConsoleImage"
 
diff --git a/recipes/images/trdx-image-fstype.inc b/recipes/images/trdx-image-fstype.inc
index 5992db4..aad5521 100644
--- a/recipes/images/trdx-image-fstype.inc
+++ b/recipes/images/trdx-image-fstype.inc
@@ -4,8 +4,8 @@ BURNFLASH := "${THISDIR}/files/${MACHINE}/burnflash.tar.bz2"
 IMAGE_ROOTFS = "${WORKDIR}/${IMAGE_NAME}${PV}/rootfs"
 
 U_BOOT_EXT = "bin"
-U_BOOT_EXT_colibri-vf = "imx"
-U_BOOT_EXT_apalis-imx6 = "imx"
+U_BOOT_EXT_vf = "imx"
+U_BOOT_EXT_mx6 = "imx"
 
 #we need some native tools for deployment
 DEPENDS_append_colibri-vf = " mtd-utils-native imx-loader-native"
-- 
cgit v1.2.3