Rework machines to use dtb file in KERNEL_DEVICETREE variable

The linux-dtb.inc has been reworked to use the Linux kernel build
system to generate the DeviceTree binaries so now KERNEL_DEVICETREE
variable should has the /target/ name, not the file path. This patch
reworks following machines:

 - imx23evk
 - imx28evk
 - imx51evk
 - imx53ard
 - imx53qsb
 - imx6dlsabreauto
 - imx6dlsabresd
 - imx6qsabreauto
 - imx6qsabresd
 - imx6solosabreauto
 - imx6solosabresd

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

diff --git a/meta-fsl-arm/conf/machine/imx23evk.conf b/meta-fsl-arm/conf/machine/imx23evk.conf
index 820f3ba2e8f5b0bfa8ab054d8593adeb77e236af..78b259bb7007640a2b4cbbb1309acffbe74b08f7 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx23evk.conf
+++ b/meta-fsl-arm/conf/machine/imx23evk.conf
@@ -11,7 +11,7 @@ IMXBOOTLETS_MACHINE = "stmp378x_dev"
 UBOOT_MACHINE = "mx23evk_config"
 
 KERNEL_IMAGETYPE = "uImage"
-KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx23-evk.dts"
+KERNEL_DEVICETREE = "imx23-evk.dtb"
 
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
 IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard"

diff --git a/meta-fsl-arm/conf/machine/imx28evk.conf b/meta-fsl-arm/conf/machine/imx28evk.conf
index b6e98d01f8d132cf153832f37a3c4d1df4f7bb4b..e38341a33e32707a3cf2d56407189788cbbdaf26 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx28evk.conf
+++ b/meta-fsl-arm/conf/machine/imx28evk.conf
@@ -11,7 +11,7 @@ IMXBOOTLETS_MACHINE = "iMX28_EVK"
 UBOOT_MACHINE = "mx28evk_config"
 
 KERNEL_IMAGETYPE = "uImage"
-KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx28-evk.dts"
+KERNEL_DEVICETREE = "imx28-evk.dtb"
 
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
 IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard"

diff --git a/meta-fsl-arm/conf/machine/imx51evk.conf b/meta-fsl-arm/conf/machine/imx51evk.conf
index 9c81dd604131debed58053467cefce952fa9ce86..c363aac41326c87d5e73b07892ba9384178ea3e2 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx51evk.conf
+++ b/meta-fsl-arm/conf/machine/imx51evk.conf
@@ -8,6 +8,6 @@ include conf/machine/include/tune-cortexa8.inc
 
 SOC_FAMILY = "mx5:mx51"
 
-KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx51-babbage.dts"
+KERNEL_DEVICETREE = "imx51-babbage.dtb"
 
 UBOOT_MACHINE = "mx51evk_config"

diff --git a/meta-fsl-arm/conf/machine/imx53ard.conf b/meta-fsl-arm/conf/machine/imx53ard.conf
index 5e6137c80facb3a521a43843f81d71071b457623..720045ab6009fc7774d00bbabcedd7ef75cd73cf 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx53ard.conf
+++ b/meta-fsl-arm/conf/machine/imx53ard.conf
@@ -8,7 +8,7 @@ include conf/machine/include/tune-cortexa8.inc
 
 SOC_FAMILY = "mx5:mx53"
 
-KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-ard.dts"
+KERNEL_DEVICETREE = "imx53-ard.dtb"
 
 UBOOT_MACHINE = "mx53ard_config"
 

diff --git a/meta-fsl-arm/conf/machine/imx53qsb.conf b/meta-fsl-arm/conf/machine/imx53qsb.conf
index ca84243497c4066a178eb4290fa8d4664440dba9..b5ea3ada668449063409db9d432a643d4205fd9c 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx53qsb.conf
+++ b/meta-fsl-arm/conf/machine/imx53qsb.conf
@@ -8,7 +8,7 @@ include conf/machine/include/tune-cortexa8.inc
 
 SOC_FAMILY = "mx5:mx53"
 
-KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-qsb.dts"
+KERNEL_DEVICETREE = "imx53-qsb.dtb"
 
 UBOOT_MACHINE = "mx53loco_config"
 

diff --git a/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf b/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf
index a8962434c9ccf62ed1cbed81502f82d2ba89ddce..9f443162323c039b48656204786a59b31d276404 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf
+++ b/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf
@@ -7,7 +7,7 @@ require conf/machine/include/imx6sabreauto-common.inc
 
 SOC_FAMILY = "mx6:mx6dl"
 
-KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-sabreauto.dts"
+KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
 
 UBOOT_MACHINE = "mx6dlsabreauto_config"
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"

diff --git a/meta-fsl-arm/conf/machine/imx6dlsabresd.conf b/meta-fsl-arm/conf/machine/imx6dlsabresd.conf
index c56d0d7a93f9f161b6b7c592db12cb4bbe72ca28..2797c7ce3fa9a6a7da4c7417d9dfa1a6af2e2937 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx6dlsabresd.conf
+++ b/meta-fsl-arm/conf/machine/imx6dlsabresd.conf
@@ -7,6 +7,6 @@ require conf/machine/include/imx6sabresd-common.inc
 
 SOC_FAMILY = "mx6:mx6dl"
 
-KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-sabresd.dts"
+KERNEL_DEVICETREE = "imx6dl-sabresd.dtb"
 
 UBOOT_MACHINE = "mx6dlsabresd_config"

diff --git a/meta-fsl-arm/conf/machine/imx6qsabreauto.conf b/meta-fsl-arm/conf/machine/imx6qsabreauto.conf
index 979ad86431a80c7f3e905b0eeb05bdc5676bd3ed..aa1fbb63ba80ec5207343a0f0232f5e4c9813e3a 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx6qsabreauto.conf
+++ b/meta-fsl-arm/conf/machine/imx6qsabreauto.conf
@@ -7,6 +7,6 @@ require conf/machine/include/imx6sabreauto-common.inc
 
 SOC_FAMILY = "mx6:mx6q"
 
-KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabreauto.dts"
+KERNEL_DEVICETREE = "imx6q-sabreauto.dtb"
 
 UBOOT_MACHINE = "mx6qsabreauto_config"

diff --git a/meta-fsl-arm/conf/machine/imx6qsabresd.conf b/meta-fsl-arm/conf/machine/imx6qsabresd.conf
index d5c200fb2c43c7d454f2deba8af4ca669efe4913..15d780b0b924b76b89bf75332b7fb79418f925f3 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx6qsabresd.conf
+++ b/meta-fsl-arm/conf/machine/imx6qsabresd.conf
@@ -7,6 +7,6 @@ require conf/machine/include/imx6sabresd-common.inc
 
 SOC_FAMILY = "mx6:mx6q"
 
-KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabresd.dts"
+KERNEL_DEVICETREE = "imx6q-sabresd.dtb"
 
 UBOOT_MACHINE = "mx6qsabresd_config"

diff --git a/meta-fsl-arm/conf/machine/imx6solosabreauto.conf b/meta-fsl-arm/conf/machine/imx6solosabreauto.conf
index 302c77c585d6371d3f5f0f1f6c0511712e6d7023..2e129346b48259635d9e67f1383314c70cab452e 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx6solosabreauto.conf
+++ b/meta-fsl-arm/conf/machine/imx6solosabreauto.conf
@@ -7,7 +7,7 @@ require conf/machine/include/imx6sabresd-common.inc
 
 SOC_FAMILY = "mx6:mx6s"
 
-KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-sabreauto.dts"
+KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
 
 UBOOT_MACHINE = " mx6solosabreauto_config"
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"

diff --git a/meta-fsl-arm/conf/machine/imx6solosabresd.conf b/meta-fsl-arm/conf/machine/imx6solosabresd.conf
index 9c0953111a219fa70f4110b706d70e026350dee5..44031a81eae0ae1664dc284e89c9884d5b4862ec 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx6solosabresd.conf
+++ b/meta-fsl-arm/conf/machine/imx6solosabresd.conf
@@ -7,7 +7,7 @@ require conf/machine/include/imx6sabresd-common.inc
 
 SOC_FAMILY = "mx6:mx6s"
 
-KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-sabresd.dts"
+KERNEL_DEVICETREE = "imx6dl-sabresd.dtb"
 
 UBOOT_MACHINE = " mx6solosabresd_config"
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"