Skip to contentSkip to conversation

ARM: dts: imxrt1050: Migrate to OF_UPSTREAM

PATCH Applied Jesse Taube 2 participants 3 messages Jan 27, 2025 – Feb 27, 2025

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

PATCH v3 1/1 ARM: dts: imxrt1050: Migrate to OF_UPSTREAM

The device tree for imxrt1050 is now
available in the /dts/upstream directory.
Migrate board to use OF_UPSTREAM.

---
V1 -> V2:
- No change
V2 -> V3:
- Remove imxrt1050-evk.dtb from Makefile

---
 arch/arm/dts/Makefile                |   3 +-
 arch/arm/dts/imxrt1050-evk.dts       |  72 --
 arch/arm/dts/imxrt1050-pinfunc.h     | 993 ---------------------------
 arch/arm/dts/imxrt1050.dtsi          | 160 -----
 configs/imxrt1050-evk_defconfig      |   3 +-
 configs/imxrt1050-evk_fspi_defconfig |   3 +-
 6 files changed, 5 insertions(+), 1229 deletions(-)
 delete mode 100644 arch/arm/dts/imxrt1050-evk.dts
 delete mode 100644 arch/arm/dts/imxrt1050-pinfunc.h
 delete mode 100644 arch/arm/dts/imxrt1050.dtsi
arch/arm/dts/Makefile +1 -2
index b7df72453ac..430cb4cf0ec 100644
@@ -920,8 +920,7 @@ dtb-$(CONFIG_ARCH_IMX9) += \
 	imx93-var-som-symphony.dtb \
 	imx93-phyboard-segin.dtb
 
-dtb-$(CONFIG_ARCH_IMXRT) += imxrt1050-evk.dtb \
-	imxrt1020-evk.dtb \
+dtb-$(CONFIG_ARCH_IMXRT) += imxrt1020-evk.dtb \
 	imxrt1170-evk.dtb \
 
 dtb-$(CONFIG_RZA1) += \
arch/arm/dts/imxrt1050-evk.dts deleted +0 -72

72 lines not on this page · raw message

arch/arm/dts/imxrt1050-pinfunc.h deleted +0 -993

993 lines not on this page · raw message

arch/arm/dts/imxrt1050.dtsi deleted +0 -160

160 lines not on this page · raw message

configs/imxrt1050-evk_defconfig +2 -1
index b488ff1b7da..918713a1c7d 100644
@@ -13,7 +13,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20020000
 CONFIG_ENV_OFFSET=0x80000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imxrt1050-evk"
+CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imxrt1050-evk"
 CONFIG_TARGET_IMXRT1050_EVK=y
 CONFIG_SPL_MMC=y
 CONFIG_SPL_SERIAL=y
@@ -48,6 +48,7 @@ CONFIG_CMD_USB=y
 # CONFIG_EFI_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_UPSTREAM=y
 CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
configs/imxrt1050-evk_fspi_defconfig +2 -1
index 5d58e723a70..86acd158391 100644
@@ -15,7 +15,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20020000
 CONFIG_ENV_OFFSET=0x80000
 CONFIG_IMX_CONFIG="board/freescale/imxrt1050-evk/imximage-nor.cfg"
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imxrt1050-evk"
+CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imxrt1050-evk"
 CONFIG_TARGET_IMXRT1050_EVK=y
 CONFIG_SPL_MMC=y
 CONFIG_SPL_SERIAL=y
@@ -50,6 +50,7 @@ CONFIG_CMD_USB=y
 # CONFIG_EFI_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_UPSTREAM=y
 CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
Signature · 1 line
2.45.2