Skip to contentSkip to conversation

arm: fsl: imx8mn_bsh_smm_s2: Migrate to OF_UPSTREAM

PATCH In review Patrick Barsanti 3 participants 3 messages Jun 10, 2024 – Jun 24, 2024

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

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

Migrate imx8mn_bsh_smm_s2 and imx8mn_bsh_smm_s2pro boards to OF_UPSTREAM.

---

Note that the patch was tested by Michael on the s2 board by applying patch [1] before it, which fixes ddr timings.
The board otherwise doesn't boot.

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

 arch/arm/dts/Makefile                      |   2 -
 arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi | 426 ---------------------
 arch/arm/dts/imx8mn-bsh-smm-s2.dts         |  48 ---
 arch/arm/dts/imx8mn-bsh-smm-s2pro.dts      | 170 --------
 arch/arm/mach-imx/imx8m/Kconfig            |   2 +
 configs/imx8mn_bsh_smm_s2_defconfig        |   2 +-
 configs/imx8mn_bsh_smm_s2pro_defconfig     |   2 +-
 7 files changed, 4 insertions(+), 648 deletions(-)
 delete mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi
 delete mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2.dts
 delete mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2pro.dts
arch/arm/dts/Makefile +0 -2
index f77a80b7dd..1196ab040a 100644
@@ -925,8 +925,6 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
 	imx8mm-phg.dtb \
 	imx8mm-phyboard-polis-rdk.dtb \
 	imx8mm-phygate-tauri-l.dtb \
-	imx8mn-bsh-smm-s2.dtb \
-	imx8mn-bsh-smm-s2pro.dtb \
 	imx8mq-cm.dtb \
 	imx8mn-var-som-symphony.dtb \
 	imx8mq-mnt-reform2.dtb \
arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi deleted +0 -426

426 lines not on this page · raw message

arch/arm/dts/imx8mn-bsh-smm-s2.dts deleted +0 -48

48 lines not on this page · raw message

arch/arm/dts/imx8mn-bsh-smm-s2pro.dts deleted +0 -170

170 lines not on this page · raw message

arch/arm/mach-imx/imx8m/Kconfig +2 -0
index 23d9217fcc..7289caf1d2 100644
@@ -137,12 +137,14 @@ config TARGET_IMX8MN_BSH_SMM_S2
 	select IMX8MN
 	select SUPPORT_SPL
 	select IMX8M_DDR3L
+	imply OF_UPSTREAM
 
 config TARGET_IMX8MN_BSH_SMM_S2PRO
 	bool "imx8mn-bsh-smm-s2pro"
 	select IMX8MN
 	select SUPPORT_SPL
 	select IMX8M_DDR3L
+	imply OF_UPSTREAM
 
 config TARGET_IMX8MN_EVK
 	bool "imx8mn LPDDR4 EVK board"
configs/imx8mn_bsh_smm_s2_defconfig +1 -1
index 0e0a548a57..b4351a392e 100644
@@ -8,7 +8,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x2000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imx8mn-bsh-smm-s2"
+CONFIG_DEFAULT_DEVICE_TREE="freescale/imx8mn-bsh-smm-s2"
 CONFIG_SPL_TEXT_BASE=0x912000
 CONFIG_TARGET_IMX8MN_BSH_SMM_S2=y
 CONFIG_OF_LIBFDT_OVERLAY=y
configs/imx8mn_bsh_smm_s2pro_defconfig +1 -1
index f739569dde..0faa3376fd 100644
@@ -8,7 +8,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x2000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imx8mn-bsh-smm-s2pro"
+CONFIG_DEFAULT_DEVICE_TREE="freescale/imx8mn-bsh-smm-s2pro"
 CONFIG_SPL_TEXT_BASE=0x912000
 CONFIG_TARGET_IMX8MN_BSH_SMM_S2PRO=y
 CONFIG_OF_LIBFDT_OVERLAY=y
Signature · 1 line
2.45.1