[meta-freescale] [meta-fsl-arm][PATCH 2/2] machines: Add IMAGE_BOOT_FILES

Mon Mar 2 03:45:33 PST 2015

Define IMAGE_BOOT_FILES in the machine configuration to be able to
create sdcard images using wic.

Signed-off-by: Alexandre Belloni <alexandre.belloni at free-electrons.com>
---
 conf/machine/imx51evk.conf          |  1 +
 conf/machine/imx53ard.conf          |  1 +
 conf/machine/imx53qsb.conf          |  1 +
 conf/machine/imx6dlsabreauto.conf   |  6 ++++++
 conf/machine/imx6dlsabresd.conf     |  7 +++++++
 conf/machine/imx6qsabreauto.conf    |  6 ++++++
 conf/machine/imx6qsabresd.conf      |  5 +++++
 conf/machine/imx6slevk.conf         |  7 +++++++
 conf/machine/imx6solosabreauto.conf |  3 +++
 conf/machine/imx6solosabresd.conf   |  4 ++++
 conf/machine/imx6sxsabreauto.conf   |  4 ++++
 conf/machine/imx6sxsabresd.conf     | 10 ++++++++++
 conf/machine/twr-vf65gs10.conf      |  2 ++
 13 files changed, 57 insertions(+)

diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf
index 9d7d06ca41fc..89bcacb932fb 100644
--- a/conf/machine/imx51evk.conf
+++ b/conf/machine/imx51evk.conf
@@ -13,5 +13,6 @@ SOC_FAMILY = "mx5:mx51"
 PERF_FEATURES_ENABLE = ""
 
 KERNEL_DEVICETREE = "imx51-babbage.dtb"
+IMAGE_BOOT_FILES = "zImage zImage-imx51-babbage.dtb;imx51-babbage.dtb"
 
 UBOOT_MACHINE = "mx51evk_config"
diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf
index c338d6b5138b..db120a6b8e28 100644
--- a/conf/machine/imx53ard.conf
+++ b/conf/machine/imx53ard.conf
@@ -13,6 +13,7 @@ SOC_FAMILY = "mx5:mx53"
 PERF_FEATURES_ENABLE = ""
 
 KERNEL_DEVICETREE = "imx53-ard.dtb"
+IMAGE_BOOT_FILES = "uImage uImage-imx53-ard.dtb;imx53-ard.dtb"
 
 UBOOT_MACHINE = "mx53ard_config"
 KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf
index 0e7349e82dfe..622f2ff910e4 100644
--- a/conf/machine/imx53qsb.conf
+++ b/conf/machine/imx53qsb.conf
@@ -13,6 +13,7 @@ SOC_FAMILY = "mx5:mx53"
 PERF_FEATURES_ENABLE = ""
 
 KERNEL_DEVICETREE = "imx53-qsb.dtb imx53-qsrb.dtb"
+IMAGE_BOOT_FILES = "zImage zImage-imx53-qsb.dtb;imx53-qsb.dtb zImage-imx53-qsrb.dtb;imx53-qsrb.dtb"
 
 UBOOT_MACHINE = "mx53loco_config"
 
diff --git a/conf/machine/imx6dlsabreauto.conf b/conf/machine/imx6dlsabreauto.conf
index 8c0fe8587d81..01a3942657dc 100644
--- a/conf/machine/imx6dlsabreauto.conf
+++ b/conf/machine/imx6dlsabreauto.conf
@@ -11,6 +11,12 @@ SOC_FAMILY = "mx6:mx6dl"
 KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb "
 KERNEL_DEVICETREE += "imx6dl-sabreauto-flexcan1.dtb "
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabreauto.dtb;imx6dl-sabreauto.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabreauto-gpmi-weim.dtb;imx6dl-sabreauto-gpmi-weim.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabreauto-ecspi.dtb;imx6dl-sabreauto-ecspi.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabreauto-flexcan1.dtb;imx6dl-sabreauto-flexcan1.dtb"
+
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6dlsabreauto_config,sdcard"
 UBOOT_CONFIG[eimnor] = "mx6dlsabreauto_eimnor_config"
diff --git a/conf/machine/imx6dlsabresd.conf b/conf/machine/imx6dlsabresd.conf
index da3ee54b7a0d..be4488f90068 100644
--- a/conf/machine/imx6dlsabresd.conf
+++ b/conf/machine/imx6dlsabresd.conf
@@ -11,6 +11,13 @@ SOC_FAMILY = "mx6:mx6dl"
 KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
                      imx6dl-sabresd-pf200.dtb imx6dl-sabresd-enetirq.dtb"
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabresd.dtb;imx6dl-sabresd.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabresd-ldo.dtb;imx6dl-sabresd-ldo.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabresd-hdcp.dtb;imx6dl-sabresd-hdcp.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabresd-pf200.dtb;imx6dl-sabresd-pf200.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabresd-enetirq.dtb;imx6dl-sabresd-enetirq.dtb"
+
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6dlsabresd_config,sdcard"
 UBOOT_CONFIG[mfgtool] = "mx6dlsabresd_config"
diff --git a/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf
index b8fdce4b712f..fdce2f718d20 100644
--- a/conf/machine/imx6qsabreauto.conf
+++ b/conf/machine/imx6qsabreauto.conf
@@ -11,6 +11,12 @@ SOC_FAMILY = "mx6:mx6q"
 KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb "
 KERNEL_DEVICETREE += "imx6q-sabreauto-flexcan1.dtb "
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6q-sabreauto.dtb;imx6q-sabreauto.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6q-sabreauto-gpmi-weim.dtb;imx6q-sabreauto-gpmi-weim.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6q-sabreauto-ecspi.dtb;imx6q-sabreauto-ecspi.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6q-sabreauto-flexcan1.dtb;imx6q-sabreauto-flexcan1.dtb"
+
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard"
 UBOOT_CONFIG[eimnor] = "mx6qsabreauto_eimnor_config"
diff --git a/conf/machine/imx6qsabresd.conf b/conf/machine/imx6qsabresd.conf
index 72d1da5d7003..368962c7d80a 100644
--- a/conf/machine/imx6qsabresd.conf
+++ b/conf/machine/imx6qsabresd.conf
@@ -11,6 +11,11 @@ SOC_FAMILY = "mx6:mx6q"
 KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
                      imx6q-sabresd-enetirq.dtb imx6q-sabresd-uart.dtb"
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6q-sabresd.dtb;imx6q-sabresd.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6q-sabresd-ldo.dtb;imx6q-sabresd-ldo.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6q-sabresd-hdcp.dtb;imx6q-sabresd-hdcp.dtb"
+
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6qsabresd_config,sdcard"
 UBOOT_CONFIG[sata] = "mx6qsabresd_sata_config"
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index 9ca57353c821..a085e0d121ab 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -12,6 +12,13 @@ SOC_FAMILY = "mx6:mx6sl"
 KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb \
                      imx6sl-evk-pf200.dtb imx6sl-evk-uart.dtb"
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6sl-evk.dtb;imx6sl-evk.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sl-evk-csi.dtb;imx6sl-evk-csi.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sl-evk-ldo.dtb;imx6sl-evk-ldo.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sl-evk-pf200.dtb;imx6sl-evk-pf200.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sl-evk-uart.dtb;imx6sl-evk-uart.dtb"
+
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6slevk_config,sdcard"
 UBOOT_CONFIG[spinor] = "mx6slevk_spinor_config"
diff --git a/conf/machine/imx6solosabreauto.conf b/conf/machine/imx6solosabreauto.conf
index ead787d00e51..80a7f9555453 100644
--- a/conf/machine/imx6solosabreauto.conf
+++ b/conf/machine/imx6solosabreauto.conf
@@ -9,6 +9,9 @@ SOC_FAMILY = "mx6:mx6dl"
 
 KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabreauto.dtb;imx6dl-sabreauto.dtb"
+
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
 KERNEL_IMAGETYPE = "zImage"
diff --git a/conf/machine/imx6solosabresd.conf b/conf/machine/imx6solosabresd.conf
index b123d8ce4a7f..090464df94d7 100644
--- a/conf/machine/imx6solosabresd.conf
+++ b/conf/machine/imx6solosabresd.conf
@@ -10,6 +10,10 @@ SOC_FAMILY = "mx6:mx6dl"
 
 KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb"
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabresd.dtb;imx6dl-sabresd.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6dl-sabresd-ldo.dtb;imx6dl-sabresd-ldo.dtb"
+
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
 KERNEL_IMAGETYPE = "zImage"
diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index ec880dd0a619..3bca7dbd9430 100644
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -10,6 +10,10 @@ SOC_FAMILY = "mx6:mx6sx"
 
 KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb imx6sx-sabreauto-m4.dtb"
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sabreauto.dtb;imx6sx-sabreauto.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sabreauto-m4.dtb;imx6sx-sabreauto-m4.dtb"
+
 UBOOT_ENTRYPOINT = "0x80008000"
 
 UBOOT_CONFIG ??= "sd"
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index 7c90de92e270..8584cf58199f 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -12,6 +12,16 @@ KERNEL_DEVICETREE = "imx6sx-sdb.dtb imx6sx-sdb-emmc.dtb imx6sx-sdb-m4.dtb \
                      imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb imx6sx-sdb-ldo.dtb \
                      imx6sx-sdb-reva-ldo.dtb imx6sx-sdb-reva.dtb"
 
+IMAGE_BOOT_FILES = "zImage"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sdb.dtb;imx6sx-sdb.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sdb-emmc.dtb;imx6sx-sdb-emmc.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sdb-m4.dtb;imx6sx-sdb-m4.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sdb-sai.dtb;imx6sx-sdb-sai.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sdb-lcdif1.dtb;imx6sx-sdb-lcdif1.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sdb-ldo.dtb;imx6sx-sdb-ldo.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sdb-reva-ldo.dtb;imx6sx-sdb-reva-ldo.dtb"
+IMAGE_BOOT_FILES += "zImage-imx6sx-sdb-reva.dtb;imx6sx-sdb-reva.dtb"
+
 UBOOT_ENTRYPOINT = "0x80008000"
 
 UBOOT_CONFIG ??= "sd"
diff --git a/conf/machine/twr-vf65gs10.conf b/conf/machine/twr-vf65gs10.conf
index 1f19dcbd79d0..a1bb26102a28 100644
--- a/conf/machine/twr-vf65gs10.conf
+++ b/conf/machine/twr-vf65gs10.conf
@@ -11,6 +11,8 @@ SOC_FAMILY = "vf60"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-timesys"
 
+IMAGE_BOOT_FILES = "zImage"
+
 UBOOT_MACHINE = "vf610twr_config"
 
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-- 
2.1.0

