From 1d51ea1913a80694ead57c76ea6e70508b25ddb5 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Wed, 2 Sep 2015 08:41:41 +0200 Subject: [PATCH] arm: mvebu: Enable DM_SERIAL on AXP / A38x boards This patch enables DM_SERIAL for all ARCH_MVEBU boards (AXP & A38x). Signed-off-by: Stefan Roese Cc: Simon Glass Cc: Luka Perkov --- arch/arm/Kconfig | 1 + include/configs/mv-common.h | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 50322c4..a3bd845 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 a2f60dc..1ecbd35 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