From 60b9259c7eb819b117cc9e80ff0f57b9daad2aa4 Mon Sep 17 00:00:00 2001 From: Kever Yang Date: Sat, 20 Jan 2018 21:43:05 +0800 Subject: [PATCH] rockchip: enable SYS_NS16550 for all SoCs by default All rockchip SoCs can use ns16550 driver, enable it for all and set SYS_NS16550_MEM32 for all SoCs. Change-Id: I4be3a801bf5537b94ed0c100cb44f49d78b8b15a Signed-off-by: Kever Yang --- arch/arm/Kconfig | 1 + arch/arm/mach-rockchip/Kconfig | 2 -- include/configs/rk3036_common.h | 3 --- include/configs/rk3066_common.h | 1 - include/configs/rk3128_common.h | 2 -- include/configs/rk3188_common.h | 2 -- include/configs/rk322x_common.h | 1 - include/configs/rk3288_common.h | 2 -- include/configs/rk3328_common.h | 2 -- include/configs/rk3368_common.h | 4 +--- include/configs/rk3399_common.h | 2 -- include/configs/rockchip-common.h | 2 ++ include/configs/rv1108_common.h | 3 --- 13 files changed, 4 insertions(+), 23 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 005a315116..a17879ddb6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1131,6 +1131,7 @@ config ARCH_ROCKCHIP select DM_REGULATOR select CMD_ROCKUSB if USB_GADGET_DOWNLOAD select ENABLE_ARM_SOC_BOOT0_HOOK + select SYS_NS16550 imply CMD_FASTBOOT imply FASTBOOT imply FAT_WRITE diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index a1554af647..64b3a61dca 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -120,7 +120,6 @@ config ROCKCHIP_RK3328 imply TPL_SERIAL_SUPPORT imply SPL_SEPARATE_BSS select DEBUG_UART_BOARD_INIT - select SYS_NS16550 help The Rockchip RK3328 is a ARM-based SoC with a quad-core Cortex-A53. including NEON and GPU, 1MB L2 cache, Mali-T7 graphics, two @@ -155,7 +154,6 @@ config ROCKCHIP_RK3368 imply SPL_SERIAL_SUPPORT imply TPL_SERIAL_SUPPORT select DEBUG_UART_BOARD_INIT - select SYS_NS16550 select GICV2 help The Rockchip RK3368 is a ARM-based SoC with a octa-core (organised diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index d883efcf9b..85e2ceee7c 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -18,9 +18,6 @@ #define CONFIG_SYS_TIMER_BASE 0x200440a0 /* TIMER5 */ #define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMER_BASE + 8) -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_MEM32 - #define CONFIG_SYS_TEXT_BASE 0x60000000 #define CONFIG_SYS_INIT_SP_ADDR 0x60100000 #define CONFIG_SYS_LOAD_ADDR 0x60800800 diff --git a/include/configs/rk3066_common.h b/include/configs/rk3066_common.h index 5ed44e2073..8d5f13b35f 100644 --- a/include/configs/rk3066_common.h +++ b/include/configs/rk3066_common.h @@ -30,7 +30,6 @@ #define CONFIG_SYS_INIT_SP_ADDR 0x78000000 #define CONFIG_SYS_LOAD_ADDR 0x70800800 -#define CONFIG_SYS_NS16550_MEM32 #define CONFIG_BOUNCE_BUFFER #define CONFIG_SPL_FRAMEWORK diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h index 3696b71960..f4798859c4 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -19,8 +19,6 @@ #define CONFIG_SYS_TIMER_BASE 0x200440a0 /* TIMER5 */ #define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMER_BASE + 8) -#define CONFIG_SYS_NS16550_MEM32 - #define CONFIG_SYS_TEXT_BASE 0x60000000 #define CONFIG_SYS_INIT_SP_ADDR 0x60100000 #define CONFIG_SYS_LOAD_ADDR 0x60800800 diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index 0fde4cc985..91e8e5c259 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -22,8 +22,6 @@ #define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMER_BASE + 8) #define CONFIG_SYS_TIMER_COUNTS_DOWN -#define CONFIG_SYS_NS16550_MEM32 - #ifdef CONFIG_SPL_ROCKCHIP_BACK_TO_BROM /* Bootrom will load u-boot binary to 0x60000000 once return from SPL */ #define CONFIG_SYS_TEXT_BASE 0x60000000 diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index 2b3c4c23c3..ecfed899cf 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMER_BASE + 8) #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SYS_NS16550_MEM32 #define CONFIG_SYS_TEXT_BASE 0x61000000 #define CONFIG_SYS_INIT_SP_ADDR 0x61100000 #define CONFIG_SYS_LOAD_ADDR 0x61800800 diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 32edcc549e..4b90a56e28 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -20,8 +20,6 @@ #define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMER_BASE + 8) #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SYS_NS16550_MEM32 - #ifdef CONFIG_SPL_ROCKCHIP_BACK_TO_BROM /* Bootrom will load u-boot binary to 0x0 once return from SPL */ #define CONFIG_SYS_TEXT_BASE 0x00000000 diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index e8665d6ee9..1ecc4f7b53 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -15,8 +15,6 @@ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SYS_NS16550_MEM32 - #define CONFIG_SYS_TEXT_BASE 0x00200000 #define CONFIG_SYS_INIT_SP_ADDR 0x00300000 #define CONFIG_SYS_LOAD_ADDR 0x00800800 diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index a7f872366e..a8a12a3eae 100644 --- a/include/configs/rk3368_common.h +++ b/include/configs/rk3368_common.h @@ -22,13 +22,11 @@ #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SPL_FRAMEWORK -#define CONFIG_SYS_NS16550_MEM32 - #define CONFIG_SYS_TEXT_BASE 0x00200000 #define CONFIG_SYS_INIT_SP_ADDR 0x00300000 #define CONFIG_SYS_LOAD_ADDR 0x00280000 +#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x00000000 #define CONFIG_SPL_MAX_SIZE 0x40000 #define CONFIG_SPL_BSS_START_ADDR 0x400000 diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index be9bdd897a..fe17975d91 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -18,8 +18,6 @@ #define CONFIG_SPL_SPI_LOAD #endif -#define CONFIG_SYS_NS16550_MEM32 - #define CONFIG_SYS_TEXT_BASE 0x00200000 #define CONFIG_SYS_INIT_SP_ADDR 0x00300000 #define CONFIG_SYS_LOAD_ADDR 0x00800800 diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 69052eb68b..c67daa265f 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -12,6 +12,8 @@ #define CONFIG_SYS_ARCH_TIMER #define CONFIG_SYS_HZ_CLOCK 24000000 +#define CONFIG_SYS_NS16550_MEM32 + #ifndef CONFIG_SPL_BUILD #include diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h index 93bda24782..df6f952b6e 100644 --- a/include/configs/rv1108_common.h +++ b/include/configs/rv1108_common.h @@ -18,9 +18,6 @@ #define CONFIG_SYS_TIMER_BASE 0x10350020 #define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMER_BASE + 8) -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_MEM32 - #define CONFIG_SYS_SDRAM_BASE 0x60000000 #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_TEXT_BASE CONFIG_SYS_SDRAM_BASE