提交 a5325cd5 编写于 作者: S Stephen Warren 提交者: Tom Rini

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: NStephen Warren <swarren@nvidia.com>
上级 1a2728ae
...@@ -496,7 +496,6 @@ unsigned long get_board_ddr_clk(void); ...@@ -496,7 +496,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600)
#define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500) #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
#define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
#define CONFIG_SERIAL_MULTI /* Enable both serial ports */
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */ #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */
#endif #endif
......
...@@ -418,7 +418,6 @@ combinations. this should be removed later ...@@ -418,7 +418,6 @@ combinations. this should be removed later
#define CONFIG_NS16550_MIN_FUNCTIONS #define CONFIG_NS16550_MIN_FUNCTIONS
#endif #endif
#define CONFIG_SERIAL_MULTI 1 /* Enable both serial ports */
#define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */ #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */
#define CONFIG_SYS_BAUDRATE_TABLE \ #define CONFIG_SYS_BAUDRATE_TABLE \
......
...@@ -388,7 +388,6 @@ ...@@ -388,7 +388,6 @@
#define CONFIG_NS16550_MIN_FUNCTIONS #define CONFIG_NS16550_MIN_FUNCTIONS
#endif #endif
#define CONFIG_SERIAL_MULTI /* Enable both serial ports */
#define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_SYS_BAUDRATE_TABLE \ #define CONFIG_SYS_BAUDRATE_TABLE \
......
...@@ -411,7 +411,6 @@ unsigned long get_board_ddr_clk(void); ...@@ -411,7 +411,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600)
#define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500) #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
#define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) #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 */ #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */
/* Use the HUSH parser */ /* Use the HUSH parser */
......
...@@ -463,7 +463,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg ...@@ -463,7 +463,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600)
#define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500) #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
#define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
#define CONFIG_SERIAL_MULTI /* Enable both serial ports */
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */ #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */
#endif #endif
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#define CONFIG_TEGRA_BOARD_STRING "Toradex Apalis T30" #define CONFIG_TEGRA_BOARD_STRING "Toradex Apalis T30"
/* Board-specific serial config */ /* Board-specific serial config */
#define CONFIG_SERIAL_MULTI
#define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Beaver" #define CONFIG_TEGRA_BOARD_STRING "NVIDIA Beaver"
/* Board-specific serial config */ /* Board-specific serial config */
#define CONFIG_SERIAL_MULTI
#define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
"fdtfile=tegra30-cardhu-a04.dtb\0" "fdtfile=tegra30-cardhu-a04.dtb\0"
/* Board-specific serial config */ /* Board-specific serial config */
#define CONFIG_SERIAL_MULTI
#define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T20" #define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T20"
/* Board-specific serial config */ /* Board-specific serial config */
#define CONFIG_SERIAL_MULTI
#define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_TEGRA_UARTA_SDIO1 #define CONFIG_TEGRA_UARTA_SDIO1
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T30" #define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T30"
/* Board-specific serial config */ /* Board-specific serial config */
#define CONFIG_SERIAL_MULTI
#define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Dalmore" #define CONFIG_TEGRA_BOARD_STRING "NVIDIA Dalmore"
/* Board-specific serial config */ /* Board-specific serial config */
#define CONFIG_SERIAL_MULTI
#define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_TEGRA_ENABLE_UARTD
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Jetson TK1" #define CONFIG_TEGRA_BOARD_STRING "NVIDIA Jetson TK1"
/* Board-specific serial config */ /* Board-specific serial config */
#define CONFIG_SERIAL_MULTI
#define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_TEGRA_ENABLE_UARTD
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#define CONFIG_TEGRA_BOARD_STRING "Google/NVIDIA Nyan-big" #define CONFIG_TEGRA_BOARD_STRING "Google/NVIDIA Nyan-big"
/* Board-specific serial config */ /* Board-specific serial config */
#define CONFIG_SERIAL_MULTI
#define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
......
...@@ -117,7 +117,6 @@ ...@@ -117,7 +117,6 @@
/* NS16550 Configuration */ /* NS16550 Configuration */
#define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SERIAL_MULTI
#define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_REG_SIZE (-4)
#define CONFIG_SYS_NS16550_CLK (48000000) #define CONFIG_SYS_NS16550_CLK (48000000)
#define CONFIG_SYS_NS16550_COM1 0x44e09000 #define CONFIG_SYS_NS16550_COM1 0x44e09000
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Tamonten™ NG Evaluation Carrier" #define CONFIG_TEGRA_BOARD_STRING "Avionic Design Tamonten™ NG Evaluation Carrier"
/* Board-specific serial config */ /* Board-specific serial config */
#define CONFIG_SERIAL_MULTI
#define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_TEGRA_ENABLE_UARTD
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Venice2" #define CONFIG_TEGRA_BOARD_STRING "NVIDIA Venice2"
/* Board-specific serial config */ /* Board-specific serial config */
#define CONFIG_SERIAL_MULTI
#define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册