diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 50322c4158370d6252c659c71a0e29a4d22c11ea..a3bd845a7c16cbc5c99cc8f0c4d8a31bbeb9dce7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -112,6 +112,7 @@ config ARCH_MVEBU select OF_CONTROL select OF_SEPARATE select DM + select DM_SERIAL config TARGET_DEVKIT3250 bool "Support devkit3250" diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index a2f60dc52753e92f0400e36c2e2aa7af2412167b..1ecbd3521f6e6cf8a43cbc5eb69a6a281d8a4251 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -39,11 +39,17 @@ /* * NS16550 Configuration */ +#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_DM_SERIAL) +#define CONFIG_DW_SERIAL +#endif + #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK CONFIG_SYS_TCLK +#if !defined(CONFIG_DM_SERIAL) +#define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_COM1 MV_UART_CONSOLE_BASE +#endif /* * Serial Port configuration