Remove CONFIG_SERIAL_MULTI

This symbol has been functionally dead for a long time.  Remove the last
and recent re-introductions of setting it, and update the whitelist so
it will not be re-introduced again.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/include/asm/arch-bcmcygnus/configs.h b/arch/arm/include/asm/arch-bcmcygnus/configs.h
index bf05cb3a72ad3fb7b44cc6fee0192afe8f4c09ea..27f30d1d2e200f90f5b6575935f46ea24454dce8 100644 (file)
--- a/arch/arm/include/asm/arch-bcmcygnus/configs.h
+++ b/arch/arm/include/asm/arch-bcmcygnus/configs.h
@@ -17,7 +17,6 @@
 
 #define CONFIG_SYS_NS16550_CLK         100000000
 #define CONFIG_SYS_NS16550_CLK_DIV     54
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_SYS_NS16550_COM3                0x18023000
 
 /* Ethernet */

diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index 0b3183a67ddbdc068626ba6f70cf6de0f0bdbc6f..5a89dc8a4a35a2866b8b2468205d200e452789a5 100644 (file)
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -15,7 +15,6 @@
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA P2571"
 
 /* Board-specific serial config */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_TEGRA_ENABLE_UARTA
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */

diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
index 713eda282138241a3aa59e2d0d32a56548d4e7c4..28f54637637288be14356ead62f29219dcfe238f 100644 (file)
--- a/include/configs/synquacer.h
+++ b/include/configs/synquacer.h
@@ -33,7 +33,6 @@
 
 /* Serial (pl011)       */
 #define UART_CLK                       (62500000)
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_PL011_CLOCK             UART_CLK
 #define CONFIG_PL01x_PORTS             {(void *)(0x2a400000)}
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 34c9ef0ced0d0d74094a7834db274fa785dc6e06..32de7d77b3c6132aee0b4e4fe524f2502bd3d1e6 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1075,7 +1075,6 @@ CONFIG_SEC_FW_SIZE
 CONFIG_SERIAL_BOOT
 CONFIG_SERIAL_FLASH
 CONFIG_SERIAL_HW_FLOW_CONTROL
-CONFIG_SERIAL_MULTI
 CONFIG_SERIAL_SOFTWARE_FIFO
 CONFIG_SERIRQ_CONTINUOUS_MODE
 CONFIG_SERVERIP