From: Stephen Warren swarren@nvidia.com

This config option isn't used anywhere at all. Remove all places that define/enable the option.

Signed-off-by: Stephen Warren swarren@nvidia.com --- 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 b396764ffaa4..2bac68d74476 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 e5cd26797ccc..d2225144a2bb 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 235780973fca..bbdcc4cdc98e 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 0206e540632d..af7d9f805d5f 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 16d2e0e1c7d6..ab35ba21d7c7 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -438,7 +438,6 @@ #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 aba9ba621cc0..620ca02d7c2b 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 c403729a8ea9..adc578a56df0 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 96dfe07c0a0f..93c5f482720c 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 8228e4208b48..6d73f9d3f21a 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 46556680821a..1e94c34b030c 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 32fe9e854ad5..30aecca220cf 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 59995043f6fb..55ef5f8cc6ca 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 4858dea2399f..eac24d39ea8d 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 f7bef706eb6d..dc9920b5b433 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 fa651c1c98ec..08345cc1e091 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 0535a6b9072d..2c43f3ebede5 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