Skip to contentSkip to conversation

omap3: omap3evm: Migrate to OF_UPSTREAM

PATCH In review Derald D. Woods 2 participants 2 messages Aug 24, 2024 – Aug 27, 2024 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 omap3: omap3evm: Migrate to OF_UPSTREAM

This commit brings the omap3evm inline with the remaining OMAP3XXX variants.

---
 arch/arm/dts/Makefile                         |   4 -
 arch/arm/dts/omap3-evm-37xx.dts               | 107 ---------
 arch/arm/dts/omap3-evm-common.dtsi            | 198 ----------------
 arch/arm/dts/omap3-evm-processor-common.dtsi  | 224 ------------------
 arch/arm/dts/omap3-evm.dts                    |  86 -------
 .../dts/omap3-panel-sharp-ls037v7dw01.dtsi    |  73 ------
 configs/omap3_evm_defconfig                   |   5 +-
 7 files changed, 2 insertions(+), 695 deletions(-)
 delete mode 100644 arch/arm/dts/omap3-evm-37xx.dts
 delete mode 100644 arch/arm/dts/omap3-evm-common.dtsi
 delete mode 100644 arch/arm/dts/omap3-evm-processor-common.dtsi
 delete mode 100644 arch/arm/dts/omap3-evm.dts
 delete mode 100644 arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi
arch/arm/dts/Makefile +0 -4
index 2d931c23fc8..03264cbd17a 100644
@@ -998,10 +998,6 @@ dtb-$(CONFIG_TARGET_ETHERNUT5) += ethernut5.dtb
 
 dtb-$(CONFIG_TARGET_USB_A9263) += usb_a9263.dtb
 
-dtb-$(CONFIG_TARGET_OMAP3_EVM) += \
-	omap3-evm-37xx.dtb \
-	omap3-evm.dtb
-
 dtb-$(CONFIG_TARGET_DEVKIT8000) += omap3-devkit8000.dtb
 
 dtb-$(CONFIG_TARGET_SAMA7G5EK) += \
arch/arm/dts/omap3-evm-37xx.dts deleted +0 -107

107 lines not on this page · raw message

arch/arm/dts/omap3-evm-common.dtsi deleted +0 -198

198 lines not on this page · raw message

arch/arm/dts/omap3-evm-processor-common.dtsi deleted +0 -224

224 lines not on this page · raw message

arch/arm/dts/omap3-evm.dts deleted +0 -86

86 lines not on this page · raw message

arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi deleted +0 -73

73 lines not on this page · raw message

configs/omap3_evm_defconfig +2 -3
index 3c8d974fbd0..d118cf36c5e 100644
@@ -6,7 +6,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4020ff00
-CONFIG_DEFAULT_DEVICE_TREE="omap3-evm"
+CONFIG_DEFAULT_DEVICE_TREE="ti/omap/omap3-evm"
 CONFIG_SPL_TEXT_BASE=0x40200000
 CONFIG_TARGET_OMAP3_EVM=y
 CONFIG_SYS_MONITOR_LEN=262144
@@ -48,10 +48,9 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1920k(u-boot),128k(u-boot-env),128k(dtb),6m(kernel),-(rootfs)"
 CONFIG_CMD_UBI=y
 # CONFIG_ISO_PARTITION is not set
-# CONFIG_SPL_EFI_PARTITION is not set
-CONFIG_SPL_PARTITION_UUIDS=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_UPSTREAM=y
 CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent"
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_FAT=y
Signature · 1 line
2.46.0