The former imx28-xea.dts file has been renamed to imx28-xea.dtsi, which is included to new imx28-xea-1.dts file.
This is a preparatory work to add support for multiple versions of XEA boards to u-boot.
Signed-off-by: Lukasz Majewski lukma@denx.de ---
arch/arm/dts/Makefile | 2 +- arch/arm/dts/imx28-xea-1-u-boot.dtsi | 11 +++++++++++ arch/arm/dts/imx28-xea-1.dts | 8 ++++++++ arch/arm/dts/{imx28-xea.dts => imx28-xea.dtsi} | 0 board/liebherr/xea/xea.env | 2 +- configs/imx28_xea_defconfig | 2 +- configs/imx28_xea_sb_defconfig | 2 +- 7 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 arch/arm/dts/imx28-xea-1-u-boot.dtsi create mode 100644 arch/arm/dts/imx28-xea-1.dts rename arch/arm/dts/{imx28-xea.dts => imx28-xea.dtsi} (100%)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index b102ffb5f6..4fc508bcfc 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -879,7 +879,7 @@ dtb-$(CONFIG_TARGET_MX23_OLINUXINO) += \
dtb-$(CONFIG_MX28) += \ imx28-evk.dtb \ - imx28-xea.dtb + imx28-xea-1.dtb
dtb-$(CONFIG_MX51) += \ imx51-babbage.dtb diff --git a/arch/arm/dts/imx28-xea-1-u-boot.dtsi b/arch/arm/dts/imx28-xea-1-u-boot.dtsi new file mode 100644 index 0000000000..4b2b21eeae --- /dev/null +++ b/arch/arm/dts/imx28-xea-1-u-boot.dtsi @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2024 + * Lukasz Majewski, DENX Software Engineering, lukma@denx.de + */ + +/* + * The minimal augmentation DTS U-Boot file to allow eMMC driver + * configuration in SPL for falcon boot. + */ +#include "imx28-xea-u-boot.dtsi" diff --git a/arch/arm/dts/imx28-xea-1.dts b/arch/arm/dts/imx28-xea-1.dts new file mode 100644 index 0000000000..8cb1190ba5 --- /dev/null +++ b/arch/arm/dts/imx28-xea-1.dts @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2024 + * Lukasz Majewski, DENX Software Engineering, lukma@denx.de + */ + +/dts-v1/; +#include "imx28-xea.dtsi" diff --git a/arch/arm/dts/imx28-xea.dts b/arch/arm/dts/imx28-xea.dtsi similarity index 100% rename from arch/arm/dts/imx28-xea.dts rename to arch/arm/dts/imx28-xea.dtsi diff --git a/board/liebherr/xea/xea.env b/board/liebherr/xea/xea.env index 043099ae87..ac6ac898ec 100644 --- a/board/liebherr/xea/xea.env +++ b/board/liebherr/xea/xea.env @@ -3,7 +3,7 @@ bootpri=mmc_mmc bootsec=sf_swu consdev=ttyAMA0 baudrate=115200 -dtbfile=imx28-xea.dtb +dtbfile=imx28-xea-1.dtb rootdev=/dev/mmcblk0p2 netdev=eth0 swufile=swupdate-image-xea-upd.itb diff --git a/configs/imx28_xea_defconfig b/configs/imx28_xea_defconfig index 64a0561a34..42cbc3d34c 100644 --- a/configs/imx28_xea_defconfig +++ b/configs/imx28_xea_defconfig @@ -11,7 +11,7 @@ CONFIG_SF_DEFAULT_SPEED=40000000 CONFIG_IMX_CONFIG="" CONFIG_DM_GPIO=y CONFIG_SPL_DM_SPI=y -CONFIG_DEFAULT_DEVICE_TREE="imx28-xea" +CONFIG_DEFAULT_DEVICE_TREE="imx28-xea-1" CONFIG_SPL_TEXT_BASE=0x1000 CONFIG_TARGET_XEA=y CONFIG_SPL_MXS_PMU_MINIMAL_VDD5V_CURRENT=y diff --git a/configs/imx28_xea_sb_defconfig b/configs/imx28_xea_sb_defconfig index 9872d35c1b..30b3568e7f 100644 --- a/configs/imx28_xea_sb_defconfig +++ b/configs/imx28_xea_sb_defconfig @@ -9,7 +9,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SF_DEFAULT_SPEED=40000000 CONFIG_DM_GPIO=y CONFIG_SPL_DM_SPI=y -CONFIG_DEFAULT_DEVICE_TREE="imx28-xea" +CONFIG_DEFAULT_DEVICE_TREE="imx28-xea-1" CONFIG_SPL_TEXT_BASE=0x1000 CONFIG_TARGET_XEA=y CONFIG_SPL=y