Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

serial: Remove CONFIG_SERIAL_MULTI from config files

Browse Source 
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>
master
Marek Vasut 12 years ago committed by Tom Rini
parent 82dda962f0
commit bffe31c144
43 changed files with 0 additions and 53 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      include/configs/DU440.h
  2. 1
      include/configs/KAREF.h
  3. 1
      include/configs/METROBOX.h
  4. 1
      include/configs/MPC8569MDS.h
  5. 1
      include/configs/P1010RDB.h
  6. 1
      include/configs/P1_P2_RDB.h
  7. 1
      include/configs/P2020COME.h
  8. 1
      include/configs/PMC440.h
  9. 1
      include/configs/TB5200.h
  10. 1
      include/configs/amcc-common.h
  11. 1
      include/configs/bfin_adi_common.h
  12. 1
      include/configs/coreboot.h
  13. 1
      include/configs/eNET.h
  14. 1
      include/configs/harmony.h
  15. 1
      include/configs/jadecpu.h
  16. 1
      include/configs/korat.h
  17. 1
      include/configs/lwmon.h
  18. 1
      include/configs/lwmon5.h
  19. 5
      include/configs/mcc200.h
  20. 1
      include/configs/medcom.h
  21. 1
      include/configs/omap3_zoom2.h
  22. 1
      include/configs/origen.h
  23. 1
      include/configs/paz00.h
  24. 1
      include/configs/pcs440ep.h
  25. 3
      include/configs/pdm360ng.h
  26. 1
      include/configs/plutux.h
  27. 1
      include/configs/quad100hd.h
  28. 1
      include/configs/s5p_goni.h
  29. 1
      include/configs/s5pc210_universal.h
  30. 1
      include/configs/sc3.h
  31. 1
      include/configs/seaboard.h
  32. 1
      include/configs/smdk5250.h
  33. 1
      include/configs/smdkc100.h
  34. 1
      include/configs/smdkv310.h
  35. 1
      include/configs/tec.h
  36. 5
      include/configs/tegra-common-post.h
  37. 1
      include/configs/trats.h
  38. 1
      include/configs/trimslice.h
  39. 1
      include/configs/trizepsiv.h
  40. 1
      include/configs/ventana.h
  41. 1
      include/configs/whistler.h
  42. 1
      include/configs/zeus.h
  43. 1
      include/configs/zynq.h

1
include/configs/DU440.h
Unescape View File

@ -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}

1
include/configs/KAREF.h
Unescape View File

@ -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 \

1
include/configs/METROBOX.h
Unescape View File

@ -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 \

1
include/configs/MPC8569MDS.h
Unescape View File

@ -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

1
include/configs/P1010RDB.h
Unescape View File

@ -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 \

1
include/configs/P1_P2_RDB.h
Unescape View File

@ -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 \

1
include/configs/P2020COME.h
Unescape View File

@ -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 \

1
include/configs/PMC440.h
Unescape View File

@ -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}

1
include/configs/TB5200.h
Unescape View File

@ -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 }

1
include/configs/amcc-common.h
Unescape View File

@ -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

1
include/configs/bfin_adi_common.h
Unescape View File

@ -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

1
include/configs/coreboot.h
Unescape View File

@ -54,7 +54,6 @@
/*-----------------------------------------------------------------------
* Serial Configuration
*/
#define CONFIG_SERIAL_MULTI
#define CONFIG_CONS_INDEX 1
#define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_SERIAL

1
include/configs/eNET.h
Unescape View File

@ -55,7 +55,6 @@
/*-----------------------------------------------------------------------
* Serial Configuration
*/
#define CONFIG_SERIAL_MULTI
#define CONFIG_CONS_INDEX 1
#define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_SERIAL

1
include/configs/harmony.h
Unescape View File

@ -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 */

1
include/configs/jadecpu.h
Unescape View File

@ -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)

1
include/configs/korat.h
Unescape View File

@ -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}

1
include/configs/lwmon.h
Unescape View File

@ -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 */

1
include/configs/lwmon5.h
Unescape View File

@ -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}

5
include/configs/mcc200.h
Unescape View File

@ -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 }

1
include/configs/medcom.h
Unescape View File

@ -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

1
include/configs/omap3_zoom2.h
Unescape View File

@ -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

1
include/configs/origen.h
Unescape View File

@ -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

1
include/configs/paz00.h
Unescape View File

@ -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

1
include/configs/pcs440ep.h
Unescape View File

@ -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}

3
include/configs/pdm360ng.h
Unescape View File

@ -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

1
include/configs/plutux.h
Unescape View File

@ -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

1
include/configs/quad100hd.h
Unescape View File

@ -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 \

1
include/configs/s5p_goni.h
Unescape View File

@ -59,7 +59,6 @@
* select serial console configuration
*/
#define CONFIG_SERIAL2 1 /* use SERIAL2 */
#define CONFIG_SERIAL_MULTI 1
#define CONFIG_BAUDRATE 115200
/* MMC */

1
include/configs/s5pc210_universal.h
Unescape View File

@ -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

1
include/configs/sc3.h
Unescape View File

@ -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

1
include/configs/seaboard.h
Unescape View File

@ -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

1
include/configs/smdk5250.h
Unescape View File

@ -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

1
include/configs/smdkc100.h
Unescape View File

@ -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

1
include/configs/smdkv310.h
Unescape View File

@ -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

1
include/configs/tec.h
Unescape View File

@ -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

5
include/configs/tegra-common-post.h
Unescape View File

@ -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

1
include/configs/trats.h
Unescape View File

@ -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

1
include/configs/trimslice.h
Unescape View File

@ -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

1
include/configs/trizepsiv.h
Unescape View File

@ -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 */

1
include/configs/ventana.h
Unescape View File

@ -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

1
include/configs/whistler.h
Unescape View File

@ -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

1
include/configs/zeus.h
Unescape View File

@ -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}

1
include/configs/zynq.h
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save