ARM: dts: omap3-evm: Enable DM and devicetree for TMDSEVM{3530, 3730}
This commit updates the configuration files needed to support OF_CONTROL
on the OMAP3 EVM baseboard.
Additionally:
- CONFIG_SYS_THUMB_BUILD is enabled
- CONFIG_SPL_ENV_SUPPORT is enabled
Tested using GCC 7.2.0 [--with-float=hard --with-mode=thumb].
Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
diff --git a/arch/arm/mach-omap2/omap3/Kconfig b/arch/arm/mach-omap2/omap3/Kconfig
index 4dbf9a2..6d714f6 100644
--- a/arch/arm/mach-omap2/omap3/Kconfig
+++ b/arch/arm/mach-omap2/omap3/Kconfig
@@ -61,6 +61,10 @@
config TARGET_OMAP3_EVM
bool "TI OMAP3 EVM"
+ select DM
+ select DM_SERIAL
+ select DM_GPIO
+ select OMAP3_GPIO_3
config TARGET_OMAP3_IGEP00X0
bool "IGEP"
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index 5103e9f..d2b8d42 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -1,16 +1,18 @@
CONFIG_ARM=y
-# CONFIG_SYS_THUMB_BUILD is not set
CONFIG_ARCH_OMAP2PLUS=y
CONFIG_SYS_TEXT_BASE=0x80100000
+CONFIG_TI_COMMON_CMD_OPTIONS=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SYS_MPUCLK=720
CONFIG_TARGET_OMAP3_EVM=y
+CONFIG_DEFAULT_DEVICE_TREE="omap3-evm"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_BOOTDELAY=3
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb"
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
+CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
# CONFIG_SPL_EXT_SUPPORT is not set
CONFIG_SPL_MTD_SUPPORT=y
@@ -35,6 +37,7 @@
# CONFIG_ISO_PARTITION is not set
# CONFIG_EFI_PARTITION is not set
CONFIG_SPL_PARTITION_UUIDS=y
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_DM=y
CONFIG_SPL_DM=y
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 89159a3..d95ccdf 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -42,8 +42,6 @@
#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1
#if defined(CONFIG_SPL_BUILD)
#undef CONFIG_SYS_NS16550_REG_SIZE
-#else /* !CONFIG_SPL_BUILD */
-#define CONFIG_SYS_NS16550_REG_SIZE (-1)
#endif /* CONFIG_SPL_BUILD */
/* NAND */
@@ -86,8 +84,6 @@
/* Environment */
#define CONFIG_PREBOOT "usb start"
-#if !defined(CONFIG_SPL_BUILD)
-
#include <config_distro_defaults.h>
#define MEM_LAYOUT_ENV_SETTINGS \
@@ -182,6 +178,4 @@
"bootm ${loadaddr} - ${fdtaddr}\0" \
BOOTENV
-#endif /* !CONFIG_SPL_BUILD */
-
#endif /* __CONFIG_H */