Merge pull request #1678 from twoerner/contrib/twoerner/32bit-dt-reorg

ARM 32-bit device-tree reorganization
author: Otavio Salvador <otavio@ossystems.com.br> 2023-11-01 11:13:26 -0300
committer: GitHub <noreply@github.com> 2023-11-01 11:13:26 -0300
commit: dd7acc0e6086cdafe2c807dd9024c0a31195cc24 (patch)
tree: a6450fe31355f4ab410450db4cd10fe9455962b7 /conf
parent: 03927dc65828be85a4520765b158a204e8ad9c5d (diff)
parent: 0d838c680659ed42587e2ecaf33ed0c2dcc79546 (diff)
download: meta-freescale-dd7acc0e6086cdafe2c807dd9024c0a31195cc24.tar.gz
4 files changed, 4 insertions, 4 deletions
diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index 64e0411a..4e2fe980 100644
--- a/conf/machine/imx23evk.conf
+++ b/conf/machine/imx23evk.conf
@@ -18,4 +18,4 @@ UBOOT_SUFFIX = "sb"
 UBOOT_MACHINE = "mx23evk_config"
-KERNEL_DEVICETREE = "imx23-evk.dtb"
+KERNEL_DEVICETREE = "nxp/mxs/imx23-evk.dtb"
diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index 99ed29a9..cecb97d2 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -21,7 +21,7 @@ UBOOT_CONFIG[sd] = "mx28evk_config,sdcard"
 UBOOT_CONFIG[nand] = "mx28evk_nand_config,ubifs"
 UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config,sdcard"
-KERNEL_DEVICETREE = "imx28-evk.dtb"
+KERNEL_DEVICETREE = "nxp/mxs/imx28-evk.dtb"
 SERIAL_CONSOLES = "115200;ttyAMA0"
diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf
index 7c66435d..5934afa1 100644
--- a/conf/machine/imx51evk.conf
+++ b/conf/machine/imx51evk.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx5:mx51:"
 include conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa8.inc
-KERNEL_DEVICETREE = "imx51-babbage.dtb"
+KERNEL_DEVICETREE = "nxp/imx/imx51-babbage.dtb"
 # This machine is not supported by u-boot-imx as it is not tested by NXP on this
 # board. So we force it to use u-boot-fslc which is based on mainline here.
diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf
index c9b98d22..60ac75d6 100644
--- a/conf/machine/imx53qsb.conf
+++ b/conf/machine/imx53qsb.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx5:mx53:"
 include conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa8.inc
-KERNEL_DEVICETREE = "imx53-qsb.dtb imx53-qsrb.dtb"
+KERNEL_DEVICETREE = "nxp/imx/imx53-qsb.dtb nxp/imx/imx53-qsrb.dtb"
 # This machine is not supported by u-boot-imx as it is not tested by NXP on this
 # board. So we force it to use u-boot-fslc which is based on mainline here.
author	Otavio Salvador <otavio@ossystems.com.br>	2023-11-01 11:13:26 -0300
committer	GitHub <noreply@github.com>	2023-11-01 11:13:26 -0300
commit	dd7acc0e6086cdafe2c807dd9024c0a31195cc24 (patch)
tree	a6450fe31355f4ab410450db4cd10fe9455962b7 /conf
parent	03927dc65828be85a4520765b158a204e8ad9c5d (diff)
parent	0d838c680659ed42587e2ecaf33ed0c2dcc79546 (diff)
download	meta-freescale-dd7acc0e6086cdafe2c807dd9024c0a31195cc24.tar.gz

diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf index 64e0411a..4e2fe980 100644 --- a/conf/machine/imx23evk.conf +++ b/conf/machine/imx23evk.conf
@@ -18,4 +18,4 @@ UBOOT_SUFFIX = "sb"
18		18
19	UBOOT_MACHINE = "mx23evk_config"	19	UBOOT_MACHINE = "mx23evk_config"
20		20
21	KERNEL_DEVICETREE = "imx23-evk.dtb"	21	KERNEL_DEVICETREE = "nxp/mxs/imx23-evk.dtb"


diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf index 99ed29a9..cecb97d2 100644 --- a/conf/machine/imx28evk.conf +++ b/conf/machine/imx28evk.conf
@@ -21,7 +21,7 @@ UBOOT_CONFIG[sd] = "mx28evk_config,sdcard"
21	UBOOT_CONFIG[nand] = "mx28evk_nand_config,ubifs"	21	UBOOT_CONFIG[nand] = "mx28evk_nand_config,ubifs"
22	UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config,sdcard"	22	UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config,sdcard"
23		23
24	KERNEL_DEVICETREE = "imx28-evk.dtb"	24	KERNEL_DEVICETREE = "nxp/mxs/imx28-evk.dtb"
25		25
26	SERIAL_CONSOLES = "115200;ttyAMA0"	26	SERIAL_CONSOLES = "115200;ttyAMA0"
27		27


diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf index 7c66435d..5934afa1 100644 --- a/conf/machine/imx51evk.conf +++ b/conf/machine/imx51evk.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx5:mx51:"
9	include conf/machine/include/imx-base.inc	9	include conf/machine/include/imx-base.inc
10	include conf/machine/include/arm/armv7a/tune-cortexa8.inc	10	include conf/machine/include/arm/armv7a/tune-cortexa8.inc
11		11
12	KERNEL_DEVICETREE = "imx51-babbage.dtb"	12	KERNEL_DEVICETREE = "nxp/imx/imx51-babbage.dtb"
13		13
14	# This machine is not supported by u-boot-imx as it is not tested by NXP on this	14	# This machine is not supported by u-boot-imx as it is not tested by NXP on this
15	# board. So we force it to use u-boot-fslc which is based on mainline here.	15	# board. So we force it to use u-boot-fslc which is based on mainline here.


diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf index c9b98d22..60ac75d6 100644 --- a/conf/machine/imx53qsb.conf +++ b/conf/machine/imx53qsb.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx5:mx53:"
9	include conf/machine/include/imx-base.inc	9	include conf/machine/include/imx-base.inc
10	include conf/machine/include/arm/armv7a/tune-cortexa8.inc	10	include conf/machine/include/arm/armv7a/tune-cortexa8.inc
11		11
12	KERNEL_DEVICETREE = "imx53-qsb.dtb imx53-qsrb.dtb"	12	KERNEL_DEVICETREE = "nxp/imx/imx53-qsb.dtb nxp/imx/imx53-qsrb.dtb"
13		13
14	# This machine is not supported by u-boot-imx as it is not tested by NXP on this	14	# This machine is not supported by u-boot-imx as it is not tested by NXP on this
15	# board. So we force it to use u-boot-fslc which is based on mainline here.	15	# board. So we force it to use u-boot-fslc which is based on mainline here.