Skip to contentSkip to conversation

warp7: Convert to OF_UPSTREAM

PATCH Applied Fabio Estevam 2 participants 3 messages Jul 22, 2024 – Aug 2, 2024

Subsystems (3)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH v2 1/1 warp7: Convert to OF_UPSTREAM

Instead of using the local imx7s-warp devicetree copies from U-Boot, convert the imx7s-warp board to OF_UPSTREAM so that the upstream kernel devicetree can be used instead.

---
Changes since v1:
- Also change warp7_bl33_defconfig.

 arch/arm/dts/Makefile         |   1 -
 arch/arm/dts/imx7s-warp.dts   | 500 ----------------------------------
 arch/arm/mach-imx/mx7/Kconfig |   1 +
 configs/warp7_bl33_defconfig  |   2 +-
 configs/warp7_defconfig       |   2 +-
 5 files changed, 3 insertions(+), 503 deletions(-)
 delete mode 100644 arch/arm/dts/imx7s-warp.dts
arch/arm/dts/Makefile +0 -1
index a4d95c8306bb..8908e0c2fe29 100644
@@ -883,7 +883,6 @@ dtb-$(CONFIG_MX7) += imx7d-sdb.dtb \
 	imx7-cm.dtb \
 	imx7d-colibri-emmc-eval-v3.dtb \
 	imx7d-colibri-eval-v3.dtb \
-	imx7s-warp.dtb \
 	imx7d-meerkat96.dtb \
 	imx7d-pico-pi.dtb \
 	imx7d-pico-hobbit.dtb \
arch/arm/dts/imx7s-warp.dts deleted +0 -500

500 lines not on this page · raw message

arch/arm/mach-imx/mx7/Kconfig +1 -0
index 3c0208e13dda..2e68557d6a90 100644
@@ -87,6 +87,7 @@ config TARGET_WARP7
 	select DM_THERMAL
 	select MX7D
 	imply CMD_DM
+	imply OF_UPSTREAM
 
 config TARGET_COLIBRI_IMX7
 	bool "Support Colibri iMX7S/iMX7D modules"
configs/warp7_bl33_defconfig +1 -1
index 51e52007efcd..6b68681553ce 100644
@@ -4,7 +4,7 @@ CONFIG_SYS_MALLOC_LEN=0x2300000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x80000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp"
+CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imx7s-warp"
 CONFIG_TARGET_WARP7=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
configs/warp7_defconfig +1 -1
index 48042b702c22..679b6e8997ee 100644
@@ -5,7 +5,7 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xC0000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp"
+CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imx7s-warp"
 CONFIG_TARGET_WARP7=y
 CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
 # CONFIG_ARMV7_VIRT is not set
Signature · 1 line
2.34.1