commit 238205f1b3e3de1fab961efd11dd0ca88ba47191
author Lokesh Vutla <lokeshvutla@ti.com> Wed Apr 26 13:37:09 2017 +0530
committer Tom Rini <trini@konsulko.com> Thu May 11 22:21:29 2017 -0400
tree b0747acf0503223a206506cf7fc36a7514508b96
parent 4548bc8d0a299a194f4b8322d66207150590b9dc

configs: am335x_evm: Enable SPL_DM

Enable SPL_DM on all AM335x based TI platforms.

http://patchwork.ozlabs.org/patch/751300/
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

include/configs/am335x_evm.h

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 796d5c3..51c3d49 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

include/configs/ti_am335x_common.h

diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
index c0e4336..e4c3c80 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