From 6f6b7cfa89e5aa3b643196a4ccc8b1ba5d6fa7a4 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 6 Mar 2018 19:02:27 -0500 Subject: Convert all of CONFIG_CONS_INDEX to Kconfig This converts the following to Kconfig: CONFIG_CONS_INDEX We have existing entries for this option in a number of places, with different guards on them. They're also sometimes used for things not directly inside of the serial driver. First, introduce a new symbol to guard the use of CONFIG_CONS_INDEX, so that in the case where we don't need this for the serial driver, but for some other use, we can still do it. Next, consolidate all of these into the single entry in drivers/serial/Kconfig. Finally, introduce CONS_INDEX_[023456] so that we can imply a correct value here to make the defconfig side of this smaller. Signed-off-by: Adam Ford [trini: Rework a lot of the logic here, such that I took authorship from Adam, but kept his S-o-B line] Signed-off-by: Tom Rini --- arch/arm/include/asm/arch-bcmcygnus/configs.h | 1 - arch/arm/include/asm/arch-bcmnsp/configs.h | 1 - arch/arm/include/asm/arch-lpc32xx/config.h | 6 ------ 3 files changed, 8 deletions(-) (limited to 'arch/arm/include') diff --git a/arch/arm/include/asm/arch-bcmcygnus/configs.h b/arch/arm/include/asm/arch-bcmcygnus/configs.h index 92b1c5e2d67..5f0164ce49c 100644 --- a/arch/arm/include/asm/arch-bcmcygnus/configs.h +++ b/arch/arm/include/asm/arch-bcmcygnus/configs.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_NS16550_CLK 100000000 #define CONFIG_SYS_NS16550_CLK_DIV 54 #define CONFIG_SERIAL_MULTI -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 0x18023000 /* Ethernet */ diff --git a/arch/arm/include/asm/arch-bcmnsp/configs.h b/arch/arm/include/asm/arch-bcmnsp/configs.h index 786deaeece3..d3f3be326f5 100644 --- a/arch/arm/include/asm/arch-bcmnsp/configs.h +++ b/arch/arm/include/asm/arch-bcmnsp/configs.h @@ -16,7 +16,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK 0x03b9aca0 -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 0x18000300 #endif /* __ARCH_CONFIGS_H */ diff --git a/arch/arm/include/asm/arch-lpc32xx/config.h b/arch/arm/include/asm/arch-lpc32xx/config.h index 3b7f6bdb720..988a8518329 100644 --- a/arch/arm/include/asm/arch-lpc32xx/config.h +++ b/arch/arm/include/asm/arch-lpc32xx/config.h @@ -27,12 +27,6 @@ #define CONFIG_SYS_NS16550_CLK 13000000 #endif -#if !defined(CONFIG_LPC32XX_HSUART) -#define CONFIG_CONS_INDEX (CONFIG_SYS_LPC32XX_UART - 2) -#else -#define CONFIG_CONS_INDEX CONFIG_SYS_LPC32XX_UART -#endif - #define CONFIG_SYS_BAUDRATE_TABLE \ { 9600, 19200, 38400, 57600, 115200, 230400, 460800 } -- cgit v1.3.1