serial: Remove CONFIG_SERIAL_MULTI from config files

Remove any notion of CONFIG_SERIAL_MULTI from board config files.
Since CONFIG_SERIAL_MULTI is now enabled by default, it is useless
to specify this config option in the board config files. Therefore
remove it.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>

diff --git a/include/configs/DU440.h b/include/configs/DU440.h
index 8bd7940ba80dffdee1f0ad761ca47dcdc6f2e5b1..bbe271303a839f6bc15d6bdaa8c6795f8318cacd 100644 (file)
--- a/include/configs/DU440.h
+++ b/include/configs/DU440.h
@@ -93,7 +93,6 @@
 #define CONFIG_SYS_NS16550_CLK         get_serial_clock()
 #undef CONFIG_SYS_EXT_SERIAL_CLOCK
 #define CONFIG_BAUDRATE                115200
-#define CONFIG_SERIAL_MULTI     1
 
 #define CONFIG_SYS_BAUDRATE_TABLE                                              \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}

diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h
index 3daf480656bfa5697472d84eb0c6705a37cf700d..546e28b8fae1f5403f52c4bb59ac399657985158 100644 (file)
--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@@ -96,7 +96,6 @@
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
 #define CONFIG_SYS_NS16550_CLK         get_serial_clock()
-#define CONFIG_SERIAL_MULTI   1
 #define CONFIG_BAUDRATE              9600
 
 #define CONFIG_SYS_BAUDRATE_TABLE  \

diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h
index 34376bc4ec4b2c61d566cb561933b70b3c58903f..286f8690a82a4f91ae084c151435c48c47a67a67 100644 (file)
--- a/include/configs/METROBOX.h
+++ b/include/configs/METROBOX.h
@@ -158,7 +158,6 @@
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
 #define CONFIG_SYS_NS16550_CLK         get_serial_clock()
-#define CONFIG_SERIAL_MULTI   1
 #define CONFIG_BAUDRATE              9600
 
 #define CONFIG_SYS_BAUDRATE_TABLE  \

diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index d9733649da19810e250f82f7cc423befdb93c16a..acd3276e9826e30e14767c9f6b7be0ac7ea20907 100644 (file)
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -274,7 +274,6 @@ extern unsigned long get_clock_freq(void);
 
 /* Serial Port */
 #define CONFIG_CONS_INDEX              1
-#define CONFIG_SERIAL_MULTI            1
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index ea6ddf757318d78ff4757fcd07246c978fd6216c..57aef21e96c9d4de5fe3337340454a700f1bbfd7 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -453,7 +453,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_NS16550_MIN_FUNCTIONS
 #endif
 
-#define CONFIG_SERIAL_MULTI            /* Enable both serial ports */
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV   /* determine from environment */
 
 #define CONFIG_SYS_BAUDRATE_TABLE      \

diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h
index 2cb5719063a571a14a2929b9e6d8bad093d21896..a57d9dd26ec37124a652d4d8133dd07d400e3488 100644 (file)
--- a/include/configs/P1_P2_RDB.h
+++ b/include/configs/P1_P2_RDB.h
@@ -343,7 +343,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #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/P2020COME.h b/include/configs/P2020COME.h
index d323fb5e098b76033247e2f6a2fec03da1702668..c75f86cb8445dd76af3a5b0d5779ac84544cb36d 100644 (file)
--- a/include/configs/P2020COME.h
+++ b/include/configs/P2020COME.h
@@ -201,7 +201,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_NS16550_REG_SIZE    1
 #define CONFIG_SYS_NS16550_CLK         get_bus_freq(0)
 
-#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/PMC440.h b/include/configs/PMC440.h
index b82095454ca74a93c6d2da190ba34ec9c2408d24..3837b8f1391a232ba222eaec02e76bf4ebe224e3 100644 (file)
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -102,7 +102,6 @@
 #define CONFIG_SYS_NS16550_CLK         get_serial_clock()
 #undef CONFIG_SYS_EXT_SERIAL_CLOCK
 #define CONFIG_BAUDRATE                115200
-#define CONFIG_SERIAL_MULTI     1
 
 #define CONFIG_SYS_BAUDRATE_TABLE                                              \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}

diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h
index feaadf3649b929b6de7e5e8645d3f63d0e6cdbe7..a624c83a21c0dc6599b28566ecdd153a6b3419f8 100644 (file)
--- a/include/configs/TB5200.h
+++ b/include/configs/TB5200.h
@@ -56,7 +56,6 @@
  * Serial console configuration
  */
 #define CONFIG_PSC_CONSOLE     1       /* default console is on PSC1 */
-#define CONFIG_SERIAL_MULTI    1       /* support multiple consoles */
 #define CONFIG_PSC_CONSOLE2    6       /* second console is on PSC6 */
 #define CONFIG_BAUDRATE                115200  /* ... at 115200 bps */
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, 230400 }

diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index 9d0c80b924dd227a63aa4814db694be856713bac..f2f522dce35c943e5d990c4c5240866315b40080 100644 (file)
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -31,7 +31,6 @@
 /*
  * UART
  */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1

diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index 063e65e77edae0d5ccdb9bffe528406fb80c9b02..ccdec0d5640d9bb8c539e06871488ad4fc191508 100644 (file)
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -108,7 +108,6 @@
 #define CONFIG_LOADS_ECHO      1
 #define CONFIG_JTAG_CONSOLE
 #define CONFIG_SILENT_CONSOLE
-#define CONFIG_SERIAL_MULTI
 #ifndef CONFIG_BAUDRATE
 # define CONFIG_BAUDRATE       57600
 #endif

diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index 2c65d74496d7b782e75053b34bcd9c043b1ffffd..0e89242db75aa34c203f90dfb47790d7b1969e6f 100644 (file)
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -54,7 +54,6 @@
 /*-----------------------------------------------------------------------
  * Serial Configuration
  */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_CONS_INDEX              1
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL

diff --git a/include/configs/eNET.h b/include/configs/eNET.h
index d5c9cad657abd8e7ced508b8e8aa7694f9335013..4b1c21904cb05f68492539a93b244db27d86f27c 100644 (file)
--- a/include/configs/eNET.h
+++ b/include/configs/eNET.h
@@ -55,7 +55,6 @@
 /*-----------------------------------------------------------------------
  * Serial Configuration
  */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_CONS_INDEX                      1
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL

diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index e407ff4ca5384b149036641bf8f8bbfdd2bf4a76..d582ae1ab6e9cf8d027ee49af403a6d00fc10fa8 100644 (file)
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -37,7 +37,6 @@
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Harmony"
 
 /* Board-specific serial config */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_TEGRA_ENABLE_UARTD
 
 /* UARTD: keyboard satellite board UART, default */

diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h
index 7b9d36d5dfb193889d2e7843d18ce6725eef2aa7..daf37bf00467550c432932a8a3f4f96d28035f50 100644 (file)
--- a/include/configs/jadecpu.h
+++ b/include/configs/jadecpu.h
@@ -68,7 +68,6 @@
 /*
  * Serial
  */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE            (-4)

diff --git a/include/configs/korat.h b/include/configs/korat.h
index 46335b4b7f7977d8f62e417d95ebe1f3f0def4f5..b919aec359fad9b51618ff5eef4a50ee24612f27 100644 (file)
--- a/include/configs/korat.h
+++ b/include/configs/korat.h
@@ -102,7 +102,6 @@
 #define CONFIG_SYS_NS16550_CLK         get_serial_clock()
 #define CONFIG_SYS_EXT_SERIAL_CLOCK    11059200        /* ext. 11.059MHz clk   */
 #define CONFIG_BAUDRATE                115200
-#define CONFIG_SERIAL_MULTI    1
 
 #define CONFIG_SYS_BAUDRATE_TABLE                                              \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}

diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index 1d89176f13e0e4eb6e02e2fab5af6c5a5a64dfe0..ab860530396ae1ba853561e80b7449cda5810387 100644 (file)
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -60,7 +60,6 @@
 #define CONFIG_LCD_INFO                1       /* ... and some board info      */
 #define        CONFIG_SPLASH_SCREEN            /* ... with splashscreen support*/
 
-#define CONFIG_SERIAL_MULTI    1
 #define CONFIG_8xx_CONS_SMC2   1       /* Console is on SMC2           */
 #define CONFIG_8xx_CONS_SCC2   1       /* Console is on SCC2           */
 

diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 497eec4ad00cd0d2afb980618891271ff408a90f..2d33ebcd711892cf45dde32c39aae2899f5a9fe5 100644 (file)
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -121,7 +121,6 @@
 #define CONFIG_SYS_NS16550_CLK         get_serial_clock()
 #undef CONFIG_SYS_EXT_SERIAL_CLOCK             /* no external clock provided   */
 #define CONFIG_BAUDRATE                115200
-#define CONFIG_SERIAL_MULTI
 
 #define CONFIG_SYS_BAUDRATE_TABLE                                              \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}

diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index d2bab457cc911a9f2b899317b8c36a0f0b9f0bb8..5318c313a35dfc5a3a12cb0552a55973b2328909 100644 (file)
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -76,17 +76,12 @@
  */
 #if !defined(CONFIG_PRS200)
 /* MCC200 configuration: */
-#define CONFIG_SERIAL_MULTI    1
 #define CONFIG_PSC_CONSOLE     1       /* PSC1 may be COM */
 #define CONFIG_PSC_CONSOLE2    2       /* PSC2 is PSoC */
 #else
 /* PRS200 configuration: */
 #define CONFIG_PSC_CONSOLE     1       /* console is on PSC1           */
 #endif
-#if defined(CONFIG_QUART_CONSOLE) && defined(CONFIG_PSC_CONSOLE) && \
-       !defined(CONFIG_SERIAL_MULTI)
-#error "Select only one console device!"
-#endif
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, 230400 }
 

diff --git a/include/configs/medcom.h b/include/configs/medcom.h
index 678b36b6cffc2844681dd09db7d2ded48e7ded84..45c4fd2ff749deacfe8e2cfe06ec2c2ef31b8535 100644 (file)
--- a/include/configs/medcom.h
+++ b/include/configs/medcom.h
@@ -38,7 +38,6 @@
 #define CONFIG_TEGRA_BOARD_STRING      "Avionic Design Medcom"
 
 /* Board-specific serial config */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_TEGRA_ENABLE_UARTD      /* UARTD: debug UART */
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTD_BASE
 

diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h
index a7cc5fc4f66c523a959511b44a947d16e5d18e05..d6814248ed18e831d8e998910f9b0b21b439e2fe 100644 (file)
--- a/include/configs/omap3_zoom2.h
+++ b/include/configs/omap3_zoom2.h
@@ -76,7 +76,6 @@
  * NS16550 Configuration
  * Zoom2 uses the TL16CP754C on the debug board
  */
-#define CONFIG_SERIAL_MULTI            1
 /*
  * 0 - 1 : first  USB with respect to the left edge of the debug board
  * 2 - 3 : second USB with respect to the left edge of the debug board

diff --git a/include/configs/origen.h b/include/configs/origen.h
index 1ab983493eeba9eb3d8393c84d3fd78d90b07e21..ff2b24d97f4305f923f5c36dbf6c3f3b32f49913 100644 (file)
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -63,7 +63,6 @@
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (1 << 20))
 
 /* select serial console configuration */
-#define CONFIG_SERIAL_MULTI            1
 #define CONFIG_SERIAL2                 1       /* use SERIAL 2 */
 #define CONFIG_BAUDRATE                        115200
 #define EXYNOS4_DEFAULT_UART_OFFSET    0x020000

diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 24cda4839ee6ed99e74c3c5a6835e769bdee974d..5603de9625330c1abbf73b1b21f4620c50597cfe 100644 (file)
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -30,7 +30,6 @@
 #define CONFIG_TEGRA_BOARD_STRING      "Compal Paz00"
 
 /* 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/pcs440ep.h b/include/configs/pcs440ep.h
index 26627bbf6024f49bc2e012b8c1f13d93ce703128..351ff5a22bf0d137f2e0e85500476feef452f949 100644 (file)
--- a/include/configs/pcs440ep.h
+++ b/include/configs/pcs440ep.h
@@ -88,7 +88,6 @@
 #define CONFIG_SYS_NS16550_CLK         get_serial_clock()
 #undef CONFIG_SYS_EXT_SERIAL_CLOCK             /* no external clk used         */
 #define CONFIG_BAUDRATE                115200
-#define CONFIG_SERIAL_MULTI     1
 
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}

diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h
index 8afc3c03dbfaa9c437966832a0b70c50df4f758d..671e9eb1e5ef866dea43edf9718fc38f75643029 100644 (file)
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@@ -298,7 +298,6 @@
 /*
  * Used PSC UART devices
  */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_SYS_PSC1
 #define CONFIG_SYS_PSC4
 #define CONFIG_SYS_PSC6
@@ -434,10 +433,8 @@
 #define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use */
 #endif
 
-#ifdef CONFIG_SERIAL_MULTI
 /* POST support */
 #define CONFIG_POST             (CONFIG_SYS_POST_COPROC)
-#endif
 
 /*
  * Environment Configuration

diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 65b42edc270b934b207b6764dbd741675b6508a3..deee2378790dcd52e8c2f33fc8d0e2c8e791d469 100644 (file)
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -38,7 +38,6 @@
 #define CONFIG_TEGRA_BOARD_STRING      "Avionic Design Plutux"
 
 /* Board-specific serial config */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_TEGRA_ENABLE_UARTD      /* UARTD: debug UART */
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTD_BASE
 

diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
index 5d0c3859877ca0a91354d312e53c5679744cda31..5f1bb581ff6b63de751f0f1ceb3dc71c021c089c 100644 (file)
--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@@ -113,7 +113,6 @@
 #undef CONFIG_SYS_EXT_SERIAL_CLOCK                     /* external serial clock */
 #define CONFIG_SYS_BASE_BAUD           691200
 #define CONFIG_BAUDRATE                115200
-#define CONFIG_SERIAL_MULTI
 
 /* The following table includes the supported baudrates */
 #define CONFIG_SYS_BAUDRATE_TABLE      \

diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 36f1a5700f344bb9fa61edb50dbf47dddc8509f7..7e0b30293560a251e230877fe03a759720b6438d 100644 (file)
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -59,7 +59,6 @@
  * select serial console configuration
  */
 #define CONFIG_SERIAL2                 1       /* use SERIAL2 */
-#define CONFIG_SERIAL_MULTI            1
 #define CONFIG_BAUDRATE                        115200
 
 /* MMC */

diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 7727624c6743396ccbcaead2567277cfbe6842d0..5fc61364355b367e6aa89ac82945f47db16a5496 100644 (file)
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -61,7 +61,6 @@
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (1 << 20))
 
 /* select serial console configuration */
-#define CONFIG_SERIAL_MULTI    1
 #define CONFIG_SERIAL2         1       /* use SERIAL 2 */
 #define CONFIG_BAUDRATE                115200
 

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 2d6e51da41e791b4e6c77f7eefd2492cc10e9668..fb74608bb9ce89ac26cf2b434b53ef98a94f426d 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -83,7 +83,6 @@
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
 #define CONFIG_SYS_NS16550_CLK         get_serial_clock()
-#define CONFIG_SERIAL_MULTI
 
 /*
  * define CONFIG_SYS_CLK_FREQ to your base crystal clock in Hz

diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index de19e38deb4ae7ad800c2007cc8d73f140dfa28e..0727a4c6f8905e4e297483c12e7cf0c430fe3b7b 100644 (file)
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -45,7 +45,6 @@
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Seaboard"
 
 /* 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/smdk5250.h b/include/configs/smdk5250.h
index 47369aa939e9e32ed4ea03e4b0e02a85cb5e4916..c0f86228b08a0fb4df48d70180144af2990b76c2 100644 (file)
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -68,7 +68,6 @@
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (1 << 20))
 
 /* select serial console configuration */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_SERIAL3                 /* use SERIAL 3 */
 #define CONFIG_BAUDRATE                        115200
 #define EXYNOS5_DEFAULT_UART_OFFSET    0x010000

diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 22de3448e31b7c73477c228c186a699fdc4ca185..fb640dba66eee202f2d0d35677fa70fae6bfc4de 100644 (file)
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -64,7 +64,6 @@
  * select serial console configuration
  */
 #define CONFIG_SERIAL0                 1       /* use SERIAL 0 on SMDKC100 */
-#define CONFIG_SERIAL_MULTI            1
 
 /* PWM */
 #define CONFIG_PWM                     1

diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 602337f4dad20ffc49d65514a04ccf45e30a46ca..b796b46a7f6b8f39ad65cf309477df3bd66b9024 100644 (file)
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -62,7 +62,6 @@
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (1 << 20))
 
 /* select serial console configuration */
-#define CONFIG_SERIAL_MULTI            1
 #define CONFIG_SERIAL1                 1       /* use SERIAL 1 */
 #define CONFIG_BAUDRATE                        115200
 #define EXYNOS4_DEFAULT_UART_OFFSET    0x010000

diff --git a/include/configs/tec.h b/include/configs/tec.h
index d5da3c7a88c532cf5b40e983f41b1c1f1eb22977..140d2e66327c7c880d42356415c7b40c7620fbd7 100644 (file)
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -39,7 +39,6 @@
 #define CONFIG_SYS_BOARD_ODMDATA       0x2b0d8011
 
 /* Board-specific serial config */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_TEGRA_ENABLE_UARTD      /* UARTD: debug UART */
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTD_BASE
 

diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index 168b64be52f7831cef4fe921cb4b01b375843b44..a01b2a7ab984d62125341540582bd1e044fa4f63 100644 (file)
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -154,11 +154,6 @@
 #undef CONFIG_OF_CONTROL
 #endif
 
-/* remove SERIAL_MULTI */
-#ifdef CONFIG_SERIAL_MULTI
-#undef CONFIG_SERIAL_MULTI
-#endif
-
 /* remove I2C support */
 #ifdef CONFIG_TEGRA_I2C
 #undef CONFIG_TEGRA_I2C

diff --git a/include/configs/trats.h b/include/configs/trats.h
index b3b5a3d5e31a0faaf8ecffb911bbcef80ec8cfee..d7808aa7123770c1b227376f84f7e3d8d1dfd86e 100644 (file)
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -69,7 +69,6 @@
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (1 << 20))
 
 /* select serial console configuration */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_SERIAL2                 /* use SERIAL 2 */
 #define CONFIG_BAUDRATE                        115200
 

diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index a46890c0947fbe94f099acad8d96a2d229f51309..eeb0dbe237b2bea407d9a0f8ca25e24f7ce102cc 100644 (file)
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -37,7 +37,6 @@
 #define CONFIG_TEGRA_BOARD_STRING      "Compulab Trimslice"
 
 /* Board-specific serial config */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_TEGRA_UARTA_GPU
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE

diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index 47c6a232d2844fb3d5aec25b218b3cd4d8f470a0..bc69c1ea2b71d7a16f6e51f3cd1d9449e247775b 100644 (file)
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -64,7 +64,6 @@
  * select serial console configuration
  */
 #define CONFIG_PXA_SERIAL
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_FFUART         1       /* we use FFUART on Conxs */
 #define CONFIG_BTUART         1       /* we use BTUART on Conxs */
 #define CONFIG_STUART         1       /* we use STUART on Conxs */

diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index 7d3a54f74322ab2052d0cf0180ed27294e6026dd..b751d58bc890982cf658a745009fc83e5f6c2e74 100644 (file)
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -37,7 +37,6 @@
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Ventana"
 
 /* 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/whistler.h b/include/configs/whistler.h
index 6c565bae14d8596430808bce638c654d215de1e4..1c7803b2660f47e073fa29242499bca0c1233e54 100644 (file)
--- a/include/configs/whistler.h
+++ b/include/configs/whistler.h
@@ -37,7 +37,6 @@
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Whistler"
 
 /* Board-specific serial config */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_TEGRA_UARTA_UAA_UAB
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE

diff --git a/include/configs/zeus.h b/include/configs/zeus.h
index 2556e3b3ef39601a9a9ae6b5d072471483115204..b0c3bd5f9b9a48410375f03b8df4a11768e02867 100644 (file)
--- a/include/configs/zeus.h
+++ b/include/configs/zeus.h
@@ -130,7 +130,6 @@
 #undef CONFIG_SYS_EXT_SERIAL_CLOCK                     /* external serial clock */
 #define CONFIG_SYS_BASE_BAUD   691200
 #define CONFIG_BAUDRATE                115200
-#define CONFIG_SERIAL_MULTI
 
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}

diff --git a/include/configs/zynq.h b/include/configs/zynq.h
index 34ac3ef3d1f90d2b732d57fe8ebb3a694a1fbea8..18fd76f47e06283190c96160f0d6200014e0aadd 100644 (file)
--- a/include/configs/zynq.h
+++ b/include/configs/zynq.h
@@ -45,7 +45,6 @@
 #define CONFIG_BAUDRATE                115200
 
 /* XPSS Serial driver */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_ZYNQ_SERIAL
 #define CONFIG_ZYNQ_SERIAL_BASEADDR0   0xE0001000
 #define CONFIG_ZYNQ_SERIAL_BAUDRATE0   CONFIG_BAUDRATE