From a5325cd5e91f77a2214e80198ae31c1d8b7e7c3c Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Wed, 5 Aug 2015 11:51:38 -0600 Subject: [PATCH] configs: Remove CONFIG_SERIAL_MULTI This config option isn't used anywhere at all. Remove all places that define/enable the option. Signed-off-by: Stephen Warren --- include/configs/B4860QDS.h | 1 - include/configs/BSC9132QDS.h | 1 - include/configs/C29XPCIE.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/apalis_t30.h | 1 - include/configs/beaver.h | 1 - include/configs/cardhu.h | 1 - include/configs/colibri_t20.h | 1 - include/configs/colibri_t30.h | 1 - include/configs/dalmore.h | 1 - include/configs/jetson-tk1.h | 1 - include/configs/nyan-big.h | 1 - include/configs/siemens-am33x-common.h | 1 - include/configs/tec-ng.h | 1 - include/configs/venice2.h | 1 - 16 files changed, 16 deletions(-) diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index b396764ffa..2bac68d744 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -496,7 +496,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600) #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) -#define CONFIG_SERIAL_MULTI /* Enable both serial ports */ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */ #endif diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index e5cd26797c..d2225144a2 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -418,7 +418,6 @@ combinations. this should be removed later #define CONFIG_NS16550_MIN_FUNCTIONS #endif -#define CONFIG_SERIAL_MULTI 1 /* Enable both serial ports */ #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */ #define CONFIG_SYS_BAUDRATE_TABLE \ diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 235780973f..bbdcc4cdc9 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -388,7 +388,6 @@ #define CONFIG_NS16550_MIN_FUNCTIONS #endif -#define CONFIG_SERIAL_MULTI /* Enable both serial ports */ #define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_SYS_BAUDRATE_TABLE \ diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 0206e54063..af7d9f805d 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -411,7 +411,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600) #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) -#define CONFIG_SERIAL_MULTI /* Enable both serial ports */ #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */ /* Use the HUSH parser */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index e88cad678a..8c7c573562 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -463,7 +463,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600) #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) -#define CONFIG_SERIAL_MULTI /* Enable both serial ports */ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */ #endif diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index aba9ba621c..620ca02d7c 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -16,7 +16,6 @@ #define CONFIG_TEGRA_BOARD_STRING "Toradex Apalis T30" /* Board-specific serial config */ -#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE diff --git a/include/configs/beaver.h b/include/configs/beaver.h index c403729a8e..adc578a56d 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -29,7 +29,6 @@ #define CONFIG_TEGRA_BOARD_STRING "NVIDIA Beaver" /* Board-specific serial config */ -#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 96dfe07c0a..93c5f48272 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -33,7 +33,6 @@ "fdtfile=tegra30-cardhu-a04.dtb\0" /* Board-specific serial config */ -#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 8228e4208b..6d73f9d3f2 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -14,7 +14,6 @@ #define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T20" /* Board-specific serial config */ -#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_TEGRA_UARTA_SDIO1 #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 4655668082..1e94c34b03 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -16,7 +16,6 @@ #define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T30" /* Board-specific serial config */ -#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 89b6f23c93..504332d3bc 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -26,7 +26,6 @@ #define CONFIG_TEGRA_BOARD_STRING "NVIDIA Dalmore" /* Board-specific serial config */ -#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index 3bbff282df..477a37ba0a 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -20,7 +20,6 @@ #define CONFIG_TEGRA_BOARD_STRING "NVIDIA Jetson TK1" /* Board-specific serial config */ -#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index dd549aa11a..38b4a87bff 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -17,7 +17,6 @@ #define CONFIG_TEGRA_BOARD_STRING "Google/NVIDIA Nyan-big" /* Board-specific serial config */ -#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 08235c7445..ceac5e0866 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -117,7 +117,6 @@ /* NS16550 Configuration */ #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SERIAL_MULTI #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK (48000000) #define CONFIG_SYS_NS16550_COM1 0x44e09000 diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index fa651c1c98..08345cc1e0 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -15,7 +15,6 @@ #define CONFIG_TEGRA_BOARD_STRING "Avionic Design Tamonten™ NG Evaluation Carrier" /* Board-specific serial config */ -#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 1d9d053b35..ffb2e8c3d1 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -17,7 +17,6 @@ #define CONFIG_TEGRA_BOARD_STRING "NVIDIA Venice2" /* Board-specific serial config */ -#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -- 2.30.2