Patchwork [meta-fsl-arm,2/3] Rework machines to use dtb file in KERNEL_DEVICETREE variable

login
register
mail settings
Submitter Otavio Salvador
Date Aug. 20, 2013, 2:32 a.m.
Message ID <1376965943-14536-2-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/56005/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - Aug. 20, 2013, 2:32 a.m.
The linux-dtb.inc has been rework 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 rework
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>
---
 conf/machine/imx23evk.conf          | 2 +-
 conf/machine/imx28evk.conf          | 2 +-
 conf/machine/imx51evk.conf          | 2 +-
 conf/machine/imx53ard.conf          | 2 +-
 conf/machine/imx53qsb.conf          | 2 +-
 conf/machine/imx6dlsabreauto.conf   | 2 +-
 conf/machine/imx6dlsabresd.conf     | 2 +-
 conf/machine/imx6qsabreauto.conf    | 2 +-
 conf/machine/imx6qsabresd.conf      | 2 +-
 conf/machine/imx6solosabreauto.conf | 2 +-
 conf/machine/imx6solosabresd.conf   | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
Daiane Angolini - Aug. 20, 2013, 3:53 p.m.
On 08/19/2013 11:32 PM, Otavio Salvador wrote:
> The linux-dtb.inc has been rework 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 rework
> following machines:


Please, take a look on other reviewed patch and fix this commit log as well.




>
>   - imx23evk
>   - imx28evk
>   - imx51evk
>   - imx53ard
>   - imx53qsb
>   - imx6dlsabreauto
>   - imx6dlsabresd
>   - imx6qsabreauto
>   - imx6qsabresd
>   - imx6solosabreauto
>   - imx6solosabresd
>
> Change-Id: I37e9c3737552299677e315b6279a6e0a8e217836
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>   conf/machine/imx23evk.conf          | 2 +-
>   conf/machine/imx28evk.conf          | 2 +-
>   conf/machine/imx51evk.conf          | 2 +-
>   conf/machine/imx53ard.conf          | 2 +-
>   conf/machine/imx53qsb.conf          | 2 +-
>   conf/machine/imx6dlsabreauto.conf   | 2 +-
>   conf/machine/imx6dlsabresd.conf     | 2 +-
>   conf/machine/imx6qsabreauto.conf    | 2 +-
>   conf/machine/imx6qsabresd.conf      | 2 +-
>   conf/machine/imx6solosabreauto.conf | 2 +-
>   conf/machine/imx6solosabresd.conf   | 2 +-
>   11 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
> index 820f3ba..78b259b 100644
> --- a/conf/machine/imx23evk.conf
> +++ b/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/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
> index b6e98d0..e38341a 100644
> --- a/conf/machine/imx28evk.conf
> +++ b/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/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf
> index 9c81dd6..c363aac 100644
> --- a/conf/machine/imx51evk.conf
> +++ b/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/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf
> index 5e6137c..720045a 100644
> --- a/conf/machine/imx53ard.conf
> +++ b/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/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf
> index ca84243..b5ea3ad 100644
> --- a/conf/machine/imx53qsb.conf
> +++ b/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/conf/machine/imx6dlsabreauto.conf b/conf/machine/imx6dlsabreauto.conf
> index a896243..9f44316 100644
> --- a/conf/machine/imx6dlsabreauto.conf
> +++ b/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/conf/machine/imx6dlsabresd.conf b/conf/machine/imx6dlsabresd.conf
> index c56d0d7..2797c7c 100644
> --- a/conf/machine/imx6dlsabresd.conf
> +++ b/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/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf
> index 979ad86..aa1fbb6 100644
> --- a/conf/machine/imx6qsabreauto.conf
> +++ b/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/conf/machine/imx6qsabresd.conf b/conf/machine/imx6qsabresd.conf
> index d5c200f..15d780b 100644
> --- a/conf/machine/imx6qsabresd.conf
> +++ b/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/conf/machine/imx6solosabreauto.conf b/conf/machine/imx6solosabreauto.conf
> index 302c77c..2e12934 100644
> --- a/conf/machine/imx6solosabreauto.conf
> +++ b/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/conf/machine/imx6solosabresd.conf b/conf/machine/imx6solosabresd.conf
> index 9c09531..44031a8 100644
> --- a/conf/machine/imx6solosabresd.conf
> +++ b/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"
>
Otavio Salvador - Aug. 20, 2013, 4:53 p.m.
On Tue, Aug 20, 2013 at 12:53 PM, Daiane Angolini
<daiane.angolini@freescale.com> wrote:
> On 08/19/2013 11:32 PM, Otavio Salvador wrote:
>>
>> The linux-dtb.inc has been rework 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 rework
>> following machines:
>
> Please, take a look on other reviewed patch and fix this commit log as well.

New commit log below:

commit 53cae59d3a7649052c7ac9d698f82367a7970e70
Author: Otavio Salvador <otavio@ossystems.com.br>
Date:   Sat Aug 17 18:55:56 2013 -0300

    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:

     - imx233-olinuxino-*
     - m28evk
     - m53evk

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

Regards,

Patch

diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index 820f3ba..78b259b 100644
--- a/conf/machine/imx23evk.conf
+++ b/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/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index b6e98d0..e38341a 100644
--- a/conf/machine/imx28evk.conf
+++ b/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/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf
index 9c81dd6..c363aac 100644
--- a/conf/machine/imx51evk.conf
+++ b/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/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf
index 5e6137c..720045a 100644
--- a/conf/machine/imx53ard.conf
+++ b/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/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf
index ca84243..b5ea3ad 100644
--- a/conf/machine/imx53qsb.conf
+++ b/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/conf/machine/imx6dlsabreauto.conf b/conf/machine/imx6dlsabreauto.conf
index a896243..9f44316 100644
--- a/conf/machine/imx6dlsabreauto.conf
+++ b/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/conf/machine/imx6dlsabresd.conf b/conf/machine/imx6dlsabresd.conf
index c56d0d7..2797c7c 100644
--- a/conf/machine/imx6dlsabresd.conf
+++ b/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/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf
index 979ad86..aa1fbb6 100644
--- a/conf/machine/imx6qsabreauto.conf
+++ b/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/conf/machine/imx6qsabresd.conf b/conf/machine/imx6qsabresd.conf
index d5c200f..15d780b 100644
--- a/conf/machine/imx6qsabresd.conf
+++ b/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/conf/machine/imx6solosabreauto.conf b/conf/machine/imx6solosabreauto.conf
index 302c77c..2e12934 100644
--- a/conf/machine/imx6solosabreauto.conf
+++ b/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/conf/machine/imx6solosabresd.conf b/conf/machine/imx6solosabresd.conf
index 9c09531..44031a8 100644
--- a/conf/machine/imx6solosabresd.conf
+++ b/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"