diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2013-08-17 19:00:36 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-08-20 13:46:05 -0300 |
commit | 15c462d9f32ff16ebe2c0820865d1bec8920c82a (patch) | |
tree | 193b8b6b49ff98c0194b23217d1607faa2e9a1fb | |
parent | 01982d05063862112e76fae5355436dae9359cf4 (diff) | |
download | meta-freescale-15c462d9f32ff16ebe2c0820865d1bec8920c82a.tar.gz |
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>
-rw-r--r-- | meta-fsl-arm/conf/machine/imx23evk.conf | 2 | ||||
-rw-r--r-- | meta-fsl-arm/conf/machine/imx28evk.conf | 2 | ||||
-rw-r--r-- | meta-fsl-arm/conf/machine/imx51evk.conf | 2 | ||||
-rw-r--r-- | meta-fsl-arm/conf/machine/imx53ard.conf | 2 | ||||
-rw-r--r-- | meta-fsl-arm/conf/machine/imx53qsb.conf | 2 | ||||
-rw-r--r-- | meta-fsl-arm/conf/machine/imx6dlsabreauto.conf | 2 | ||||
-rw-r--r-- | meta-fsl-arm/conf/machine/imx6dlsabresd.conf | 2 | ||||
-rw-r--r-- | meta-fsl-arm/conf/machine/imx6qsabreauto.conf | 2 | ||||
-rw-r--r-- | meta-fsl-arm/conf/machine/imx6qsabresd.conf | 2 | ||||
-rw-r--r-- | meta-fsl-arm/conf/machine/imx6solosabreauto.conf | 2 | ||||
-rw-r--r-- | meta-fsl-arm/conf/machine/imx6solosabresd.conf | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/meta-fsl-arm/conf/machine/imx23evk.conf b/meta-fsl-arm/conf/machine/imx23evk.conf index 820f3ba2e..78b259bb7 100644 --- a/meta-fsl-arm/conf/machine/imx23evk.conf +++ b/meta-fsl-arm/conf/machine/imx23evk.conf | |||
@@ -11,7 +11,7 @@ IMXBOOTLETS_MACHINE = "stmp378x_dev" | |||
11 | UBOOT_MACHINE = "mx23evk_config" | 11 | UBOOT_MACHINE = "mx23evk_config" |
12 | 12 | ||
13 | KERNEL_IMAGETYPE = "uImage" | 13 | KERNEL_IMAGETYPE = "uImage" |
14 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx23-evk.dts" | 14 | KERNEL_DEVICETREE = "imx23-evk.dtb" |
15 | 15 | ||
16 | SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" | 16 | SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" |
17 | IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard" | 17 | 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 b6e98d01f..e38341a33 100644 --- a/meta-fsl-arm/conf/machine/imx28evk.conf +++ b/meta-fsl-arm/conf/machine/imx28evk.conf | |||
@@ -11,7 +11,7 @@ IMXBOOTLETS_MACHINE = "iMX28_EVK" | |||
11 | UBOOT_MACHINE = "mx28evk_config" | 11 | UBOOT_MACHINE = "mx28evk_config" |
12 | 12 | ||
13 | KERNEL_IMAGETYPE = "uImage" | 13 | KERNEL_IMAGETYPE = "uImage" |
14 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx28-evk.dts" | 14 | KERNEL_DEVICETREE = "imx28-evk.dtb" |
15 | 15 | ||
16 | SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" | 16 | SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" |
17 | IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard" | 17 | 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 9c81dd604..c363aac41 100644 --- 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 | |||
8 | 8 | ||
9 | SOC_FAMILY = "mx5:mx51" | 9 | SOC_FAMILY = "mx5:mx51" |
10 | 10 | ||
11 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx51-babbage.dts" | 11 | KERNEL_DEVICETREE = "imx51-babbage.dtb" |
12 | 12 | ||
13 | UBOOT_MACHINE = "mx51evk_config" | 13 | UBOOT_MACHINE = "mx51evk_config" |
diff --git a/meta-fsl-arm/conf/machine/imx53ard.conf b/meta-fsl-arm/conf/machine/imx53ard.conf index 5e6137c80..720045ab6 100644 --- 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 | |||
8 | 8 | ||
9 | SOC_FAMILY = "mx5:mx53" | 9 | SOC_FAMILY = "mx5:mx53" |
10 | 10 | ||
11 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-ard.dts" | 11 | KERNEL_DEVICETREE = "imx53-ard.dtb" |
12 | 12 | ||
13 | UBOOT_MACHINE = "mx53ard_config" | 13 | UBOOT_MACHINE = "mx53ard_config" |
14 | 14 | ||
diff --git a/meta-fsl-arm/conf/machine/imx53qsb.conf b/meta-fsl-arm/conf/machine/imx53qsb.conf index ca8424349..b5ea3ada6 100644 --- 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 | |||
8 | 8 | ||
9 | SOC_FAMILY = "mx5:mx53" | 9 | SOC_FAMILY = "mx5:mx53" |
10 | 10 | ||
11 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-qsb.dts" | 11 | KERNEL_DEVICETREE = "imx53-qsb.dtb" |
12 | 12 | ||
13 | UBOOT_MACHINE = "mx53loco_config" | 13 | UBOOT_MACHINE = "mx53loco_config" |
14 | 14 | ||
diff --git a/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf b/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf index a8962434c..9f4431623 100644 --- 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 | |||
7 | 7 | ||
8 | SOC_FAMILY = "mx6:mx6dl" | 8 | SOC_FAMILY = "mx6:mx6dl" |
9 | 9 | ||
10 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-sabreauto.dts" | 10 | KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb" |
11 | 11 | ||
12 | UBOOT_MACHINE = "mx6dlsabreauto_config" | 12 | UBOOT_MACHINE = "mx6dlsabreauto_config" |
13 | PREFERRED_PROVIDER_u-boot = "u-boot-imx" | 13 | 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 c56d0d7a9..2797c7ce3 100644 --- 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 | |||
7 | 7 | ||
8 | SOC_FAMILY = "mx6:mx6dl" | 8 | SOC_FAMILY = "mx6:mx6dl" |
9 | 9 | ||
10 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-sabresd.dts" | 10 | KERNEL_DEVICETREE = "imx6dl-sabresd.dtb" |
11 | 11 | ||
12 | UBOOT_MACHINE = "mx6dlsabresd_config" | 12 | UBOOT_MACHINE = "mx6dlsabresd_config" |
diff --git a/meta-fsl-arm/conf/machine/imx6qsabreauto.conf b/meta-fsl-arm/conf/machine/imx6qsabreauto.conf index 979ad8643..aa1fbb63b 100644 --- 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 | |||
7 | 7 | ||
8 | SOC_FAMILY = "mx6:mx6q" | 8 | SOC_FAMILY = "mx6:mx6q" |
9 | 9 | ||
10 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabreauto.dts" | 10 | KERNEL_DEVICETREE = "imx6q-sabreauto.dtb" |
11 | 11 | ||
12 | UBOOT_MACHINE = "mx6qsabreauto_config" | 12 | UBOOT_MACHINE = "mx6qsabreauto_config" |
diff --git a/meta-fsl-arm/conf/machine/imx6qsabresd.conf b/meta-fsl-arm/conf/machine/imx6qsabresd.conf index d5c200fb2..15d780b0b 100644 --- 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 | |||
7 | 7 | ||
8 | SOC_FAMILY = "mx6:mx6q" | 8 | SOC_FAMILY = "mx6:mx6q" |
9 | 9 | ||
10 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabresd.dts" | 10 | KERNEL_DEVICETREE = "imx6q-sabresd.dtb" |
11 | 11 | ||
12 | UBOOT_MACHINE = "mx6qsabresd_config" | 12 | UBOOT_MACHINE = "mx6qsabresd_config" |
diff --git a/meta-fsl-arm/conf/machine/imx6solosabreauto.conf b/meta-fsl-arm/conf/machine/imx6solosabreauto.conf index 302c77c58..2e129346b 100644 --- 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 | |||
7 | 7 | ||
8 | SOC_FAMILY = "mx6:mx6s" | 8 | SOC_FAMILY = "mx6:mx6s" |
9 | 9 | ||
10 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-sabreauto.dts" | 10 | KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb" |
11 | 11 | ||
12 | UBOOT_MACHINE = " mx6solosabreauto_config" | 12 | UBOOT_MACHINE = " mx6solosabreauto_config" |
13 | PREFERRED_PROVIDER_u-boot = "u-boot-imx" | 13 | 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 9c0953111..44031a81e 100644 --- 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 | |||
7 | 7 | ||
8 | SOC_FAMILY = "mx6:mx6s" | 8 | SOC_FAMILY = "mx6:mx6s" |
9 | 9 | ||
10 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-sabresd.dts" | 10 | KERNEL_DEVICETREE = "imx6dl-sabresd.dtb" |
11 | 11 | ||
12 | UBOOT_MACHINE = " mx6solosabresd_config" | 12 | UBOOT_MACHINE = " mx6solosabresd_config" |
13 | PREFERRED_PROVIDER_u-boot = "u-boot-imx" | 13 | PREFERRED_PROVIDER_u-boot = "u-boot-imx" |