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 <swarren@nvidia.com>

diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index b396764ffaa4418b916093daeedbf7b32c9bde1f..2bac68d74476d167fc5d770731330823c85e870a 100644 (file)
--- 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 e5cd26797cccd3a9cc43c0406836fc2683a7b7f4..d2225144a2bb56b5ac38b1aa1b85b113eb08529f 100644 (file)
--- 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 235780973fca905e024571901c75ccbad3baa5e8..bbdcc4cdc98e564041c447df0c509741d8ecb329 100644 (file)
--- 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 0206e540632dd9eb339e8ecacaa2b2054f4b3891..af7d9f805d5f724a68e4744d924ff073a1b6b074 100644 (file)
--- 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 e88cad678afceadef8f18faa226ec7588e1d57cb..8c7c573562d188702923595e5b116547fc9b9412 100644 (file)
--- 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 aba9ba621cc0237ee7be59526641f44c81dc9e39..620ca02d7c2bcd5c5263da08ba4a0d9d27137db3 100644 (file)
--- 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 c403729a8ea9a434d17f624919e3a7608f96cc02..adc578a56df08cf31db2cb738240d8267f7fa991 100644 (file)
--- 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 96dfe07c0a0f5ccfff317640793d3c272d4d4e98..93c5f482720c9fade5b98bf0100e157c810487e5 100644 (file)
--- 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 8228e4208b48e9d1a33eee2dd5136980cea1de12..6d73f9d3f21a01ac0e7f5af8d6941d7fa0c258b2 100644 (file)
--- 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 46556680821a3cc59f94767bfb39af37425d7615..1e94c34b030ccfa5447275d115e81bb87e1a1fdb 100644 (file)
--- 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 89b6f23c93b67a29735cf1612158e2c6e4b96210..504332d3bc66c2f9a76f60c49a29b8e3f94c3422 100644 (file)
--- 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 3bbff282df272b5da36be1d1c80d46538f5db47a..477a37ba0aef644db0507a20cdb444582282808f 100644 (file)
--- 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 dd549aa11af905677a2d6959f8cebb48141dceae..38b4a87bffb5f67ea012b8d96a0d49122a24fa88 100644 (file)
--- 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 08235c74453bddaa04a9e72fd898c3f77b69c58d..ceac5e08660216a0911030b64bb2a4ec0e8d4ee3 100644 (file)
--- 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 fa651c1c98ec895bdd62071c12bf0d43a45d89ea..08345cc1e091dd0cc1ae1513a8c51be41a3bd30c 100644 (file)
--- 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 1d9d053b35663b3f809005da1776010abb95f01c..ffb2e8c3d131a80ef137c207c3ae6633f6d5cbd0 100644 (file)
--- 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