arm: am437x: cm-t43: migrate CONFIG_DM_SERIAL to config file

Move CONFIG_DM_SERIAL to cm_t43_defconfig. This forces us to update the
CONFIG_SYS_NS16550_REG_SIZE value for SPL.

Cc: Tom Rini <[email protected]>
Cc: Albert Aribaud <[email protected]>
Cc: Igor Grinberg <[email protected]>
Signed-off-by: Nikita Kiryanov <[email protected]>
Reviewed-by: Tom Rini <[email protected]>

diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig
index 6044ae94c24667326a07cb8eaf5258c49b086c5c..98e21cfa820f9db003e93a3e2009381de31ae8f0 100644 (file)
--- a/configs/cm_t43_defconfig
+++ b/configs/cm_t43_defconfig
@@ -10,3 +10,4 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_DM=y
 CONFIG_SYS_NS16550=y
+CONFIG_DM_SERIAL=y

diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index d0dfdef03e3d8ae68fb2f2dcb3e8c159712e13ae..6abc085b982d559e3e6d62f6ba001b0c523bb78a 100644 (file)
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -18,10 +18,12 @@
 #include <asm/arch/omap.h>
 
 /* Serial support */
-#define CONFIG_DM_SERIAL
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK         48000000
 #define CONFIG_SYS_NS16550_COM1                0x44e09000
+#ifdef CONFIG_SPL_BUILD
+#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
+#endif
 
 /* NAND support */
 #define CONFIG_NAND