From bffe31c144909722eb8b5878992fdf402cd42f9d Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 14 Sep 2012 23:39:52 +0200 Subject: [PATCH] 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 Cc: Marek Vasut Cc: Anatolij Gustschin Cc: Stefan Roese Signed-off-by: Tom Rini --- include/configs/DU440.h | 1 - include/configs/KAREF.h | 1 - include/configs/METROBOX.h | 1 - include/configs/MPC8569MDS.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P1_P2_RDB.h | 1 - include/configs/P2020COME.h | 1 - include/configs/PMC440.h | 1 - include/configs/TB5200.h | 1 - include/configs/amcc-common.h | 1 - include/configs/bfin_adi_common.h | 1 - include/configs/coreboot.h | 1 - include/configs/eNET.h | 1 - include/configs/harmony.h | 1 - include/configs/jadecpu.h | 1 - include/configs/korat.h | 1 - include/configs/lwmon.h | 1 - include/configs/lwmon5.h | 1 - include/configs/mcc200.h | 5 ----- include/configs/medcom.h | 1 - include/configs/omap3_zoom2.h | 1 - include/configs/origen.h | 1 - include/configs/paz00.h | 1 - include/configs/pcs440ep.h | 1 - include/configs/pdm360ng.h | 3 --- include/configs/plutux.h | 1 - include/configs/quad100hd.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/s5pc210_universal.h | 1 - include/configs/sc3.h | 1 - include/configs/seaboard.h | 1 - include/configs/smdk5250.h | 1 - include/configs/smdkc100.h | 1 - include/configs/smdkv310.h | 1 - include/configs/tec.h | 1 - include/configs/tegra-common-post.h | 5 ----- include/configs/trats.h | 1 - include/configs/trimslice.h | 1 - include/configs/trizepsiv.h | 1 - include/configs/ventana.h | 1 - include/configs/whistler.h | 1 - include/configs/zeus.h | 1 - include/configs/zynq.h | 1 - 43 files changed, 53 deletions(-) diff --git a/include/configs/DU440.h b/include/configs/DU440.h index 8bd7940ba8..bbe271303a 100644 --- 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 3daf480656..546e28b8fa 100644 --- 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 34376bc4ec..286f8690a8 100644 --- 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 d9733649da..acd3276e98 100644 --- 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 ea6ddf7573..57aef21e96 100644 --- 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 2cb5719063..a57d9dd26e 100644 --- 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 d323fb5e09..c75f86cb84 100644 --- 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 b82095454c..3837b8f139 100644 --- 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 feaadf3649..a624c83a21 100644 --- 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 9d0c80b924..f2f522dce3 100644 --- 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 063e65e77e..ccdec0d564 100644 --- 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 2c65d74496..0e89242db7 100644 --- 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 d5c9cad657..4b1c21904c 100644 --- 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 e407ff4ca5..d582ae1ab6 100644 --- 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 7b9d36d5df..daf37bf004 100644 --- 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 46335b4b7f..b919aec359 100644 --- 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 1d89176f13..ab86053039 100644 --- 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 497eec4ad0..2d33ebcd71 100644 --- 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 d2bab457cc..5318c313a3 100644 --- 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 678b36b6cf..45c4fd2ff7 100644 --- 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 a7cc5fc4f6..d6814248ed 100644 --- 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 1ab983493e..ff2b24d97f 100644 --- 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 24cda4839e..5603de9625 100644 --- 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 26627bbf60..351ff5a22b 100644 --- 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 8afc3c03db..671e9eb1e5 100644 --- 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 65b42edc27..deee237879 100644 --- 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 5d0c385987..5f1bb581ff 100644 --- 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 36f1a5700f..7e0b302935 100644 --- 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 7727624c67..5fc6136435 100644 --- 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 2d6e51da41..fb74608bb9 100644 --- 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 de19e38deb..0727a4c6f8 100644 --- 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 47369aa939..c0f86228b0 100644 --- 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 22de3448e3..fb640dba66 100644 --- 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 602337f4da..b796b46a7f 100644 --- 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 d5da3c7a88..140d2e6632 100644 --- 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 168b64be52..a01b2a7ab9 100644 --- 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 b3b5a3d5e3..d7808aa712 100644 --- 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 a46890c094..eeb0dbe237 100644 --- 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 47c6a232d2..bc69c1ea2b 100644 --- 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 7d3a54f743..b751d58bc8 100644 --- 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 6c565bae14..1c7803b266 100644 --- 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 2556e3b3ef..b0c3bd5f9b 100644 --- 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 34ac3ef3d1..18fd76f47e 100644 --- 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 -- 2.25.1