Skip to contentSkip to conversation

arm: fsl: imx6ulz_bsh_smm_m2: Migrate to OF_UPSTREAM

PATCH In review Patrick Barsanti 2 participants 2 messages Jun 13, 2024 – Jun 24, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: fsl: imx6ulz_bsh_smm_m2: Migrate to OF_UPSTREAM

Migrate imx6ulz_bsh_smm_m2 board to OF_UPSTREAM.

---

This breaks compilation because upstream and local DTs are different. The Makefile gives priority to the local DT headers, which are missing a define, specifically in imx6ul-clock.h. As of now, upstreamed boards are being compiled potentially using some legacy files. Because of this, this patch requires patch [1] to be applied first.

Links:
- [1] https://lore.kernel.org/u-boot/[email protected]/

 arch/arm/dts/Makefile               |   1 -
 arch/arm/dts/imx6ulz-bsh-smm-m2.dts | 146 ----------------------------
 arch/arm/mach-imx/mx6/Kconfig       |   1 +
 configs/imx6ulz_smm_m2_defconfig    |   2 +-
 4 files changed, 2 insertions(+), 148 deletions(-)
 delete mode 100644 arch/arm/dts/imx6ulz-bsh-smm-m2.dts
arch/arm/dts/Makefile +0 -1
index 1196ab040a..2c43bdbc19 100644
@@ -871,7 +871,6 @@ dtb-$(CONFIG_MX6ULL) += \
 	imx6ull-phytec-segin-ff-rdk-emmc.dtb \
 	imx6ull-dart-6ul.dtb \
 	imx6ull-somlabs-visionsom.dtb \
-	imx6ulz-bsh-smm-m2.dtb \
 	imx6ulz-14x14-evk.dtb
 
 dtb-$(CONFIG_ARCH_MX6) += \
arch/arm/dts/imx6ulz-bsh-smm-m2.dts deleted +0 -146

146 lines not on this page · raw message

arch/arm/mach-imx/mx6/Kconfig +1 -0
index 15ee2b933f..7800553ae8 100644
@@ -481,6 +481,7 @@ config TARGET_MX6ULZ_SMM_M2
 	select DM_MTD
 	select DM_THERMAL
 	select SUPPORT_SPL
+	imply OF_UPSTREAM
 
 config TARGET_MYS_6ULX
 	bool "MYiR MYS-6ULX"
configs/imx6ulz_smm_m2_defconfig +1 -1
index 064758c48c..93ead4c373 100644
@@ -11,7 +11,7 @@ CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x400000
 CONFIG_MX6ULL=y
 CONFIG_TARGET_MX6ULZ_SMM_M2=y
-CONFIG_DEFAULT_DEVICE_TREE="imx6ulz-bsh-smm-m2"
+CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imx6ulz-bsh-smm-m2"
 CONFIG_SPL_TEXT_BASE=0x00908000
 CONFIG_SPL_SERIAL=y
 CONFIG_SPL_BSS_START_ADDR=0x84100000
Signature · 1 line
2.45.1