Enable SPL_DM on all AM335x based TI platforms.
http://patchwork.ozlabs.org/patch/751300/ Signed-off-by: Lokesh Vutla lokeshvutla@ti.com --- Changes since v1: - None arch/arm/mach-omap2/am33xx/Kconfig | 5 +++++ include/configs/am335x_evm.h | 1 - include/configs/ti_am335x_common.h | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig index cf5d95a26d..acdb88a702 100644 --- a/arch/arm/mach-omap2/am33xx/Kconfig +++ b/arch/arm/mach-omap2/am33xx/Kconfig @@ -29,6 +29,11 @@ config TARGET_AM335X_EVM imply SPL_SERIAL_SUPPORT imply SPL_WATCHDOG_SUPPORT imply SPL_YMODEM_SUPPORT + imply SPL_SYS_MALLOC_SIMPLE + imply SPL_SEPARATE_BSS + imply SPL_DM + imply SPL_DM_SEQ_ALIAS + imply SPL_OF_LIBFDT help This option specifies support for the AM335x GP and HS EVM development platforms. The AM335x diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 796d5c32e9..51c3d493c8 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -291,7 +291,6 @@ * DM support in SPL */ #ifdef CONFIG_SPL_BUILD -#undef CONFIG_DM_MMC #undef CONFIG_TIMER #undef CONFIG_DM_USB #endif diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index c0e4336eb0..e4c3c807f2 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -22,8 +22,10 @@ /* NS16550 Configuration */ #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_NS16550_SERIAL +#ifndef CONFIG_DM_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4) #endif +#endif #define CONFIG_SYS_NS16550_CLK 48000000
#ifndef CONFIG_SPL_BUILD