[U-Boot] [PATCH] Configs: various: remove dead defines
Adam Ford
aford173 at gmail.com
Sun Mar 4 22:32:17 UTC 2018
CONFIG_SERIAL0-5 appears to be nothing by dead defines with no
corresponding source. Let's remove this to cleanup the serial
configs a bit
Signed-off-by: Adam Ford <aford173 at gmail.com>
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index b97a761..c774075 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -59,7 +59,6 @@
* select serial console configuration
*/
#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
-#define CONFIG_SERIAL3 3 /* UART3 on CRANEBOARD */
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index 641bdb7..8d5775c 100644
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -83,7 +83,6 @@
#define CONFIG_SYS_AUTOLOAD "no"
/* Serial console configuration */
-#define CONFIG_SERIAL1 1 /* UART0 */
/* NS16550 Configuration */
#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index e464e40..51db17a 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -63,7 +63,6 @@
* select serial console configuration
*/
#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
-#define CONFIG_SERIAL3 3 /* UART3 */
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index a57715e..7c9a84b 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -67,7 +67,6 @@
* select serial console configuration
*/
#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
-#define CONFIG_SERIAL3 3 /* UART3 */
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h
index 63568ca..7940a1e 100644
--- a/include/configs/eco5pk.h
+++ b/include/configs/eco5pk.h
@@ -17,10 +17,8 @@
/* Our console port is port3 */
#undef CONFIG_SYS_NS16550_COM1
-#undef CONFIG_SERIAL1
#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
-#define CONFIG_SERIAL3
#define CONFIG_MACH_TYPE MACH_TYPE_ECO5_PK
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 045f602..9d81726 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -61,7 +61,6 @@
* select serial console configuration
*/
#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
-#define CONFIG_SERIAL3 3 /* UART3 */
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 3cf78d4..554f5ef 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -74,7 +74,6 @@
* select serial console configuration
*/
#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
-#define CONFIG_SERIAL3 3 /* UART3 on RX-51 */
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 2c8ee7a..df65582 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -38,7 +38,6 @@
#include <linux/sizes.h>
/* select serial console configuration */
-#define CONFIG_SERIAL1
/* Console configuration */
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 9067ba6..b58d93f 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -16,7 +16,6 @@
#define CONFIG_SYS_SDRAM_BASE 0x40000000
/* select serial console configuration */
-#define CONFIG_SERIAL2 /* use SERIAL 2 */
#define TZPC_BASE_OFFSET 0x10000
diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
index 1fa02a5..57ac3ec 100644
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -206,8 +206,6 @@
#ifdef CONFIG_SPL_BUILD
#undef CONFIG_SYS_NS16550_COM3
#define CONFIG_SYS_NS16550_COM2 OMAP34XX_UART2
-#undef CONFIG_SERIAL3
-#define CONFIG_SERIAL2
#endif
/* Provide the MACH_TYPE value the vendor kernel requires */
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index ce4863c..e06c505 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -38,7 +38,6 @@
#define CONFIG_SYS_NS16550_REG_SIZE (-4)
#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
-#define CONFIG_SERIAL3 3
/* commands to include */
diff --git a/include/configs/origen.h b/include/configs/origen.h
index 2719138..0e5a791 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -31,7 +31,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_ORIGEN
/* select serial console configuration */
-#define CONFIG_SERIAL2
/* Console configuration */
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h
index 10af572..e7edeb6 100644
--- a/include/configs/peach-pi.h
+++ b/include/configs/peach-pi.h
@@ -25,7 +25,6 @@
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_IRAM_TOP - 0x800)
/* select serial console configuration */
-#define CONFIG_SERIAL3 /* use SERIAL 3 */
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
/* Display */
diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
index cb5937e..a04f047 100644
--- a/include/configs/peach-pit.h
+++ b/include/configs/peach-pit.h
@@ -25,7 +25,6 @@
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_IRAM_TOP - 0x800)
/* select serial console configuration */
-#define CONFIG_SERIAL3 /* use SERIAL 3 */
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
/* DRAM Memory Banks */
diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h
index 74bfde7..5b7696a 100644
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -11,7 +11,6 @@
#ifndef __CONFIG_PENGWYN_H
#define __CONFIG_PENGWYN_H
-#define CONFIG_SERIAL1
#include <configs/ti_am335x_common.h>
diff --git a/include/configs/pepper.h b/include/configs/pepper.h
index 6743fd1..c2360eb 100644
--- a/include/configs/pepper.h
+++ b/include/configs/pepper.h
@@ -72,7 +72,6 @@
"fi;" \
/* Serial console configuration */
-#define CONFIG_SERIAL1 1
#define CONFIG_SYS_NS16550_COM1 0x44e09000
/* Ethernet support */
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 1b40c29..b00a6f2 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -40,7 +40,6 @@
/*
* select serial console configuration
*/
-#define CONFIG_SERIAL2 1 /* use SERIAL2 */
/* MMC */
#define SDHCI_MAX_HOSTS 4
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 841dedd..5fef30a 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -25,7 +25,6 @@
#define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */
/* select serial console configuration */
-#define CONFIG_SERIAL2
/* Console configuration */
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index b23e20a..1843c12 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -86,7 +86,6 @@
#define CONFIG_SYS_NS16550_COM1 0x44e09000
#define CONFIG_SYS_NS16550_COM4 0x481a6000
-#define CONFIG_SERIAL1 1
/* I2C Configuration */
#define CONFIG_I2C
diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index 2727d65..6bece73 100644
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -26,7 +26,6 @@
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_IRAM_TOP - 0x800)
/* select serial console configuration */
-#define CONFIG_SERIAL3 /* use SERIAL 3 */
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 8a0718e..9de5168 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -46,7 +46,6 @@
/*
* select serial console configuration
*/
-#define CONFIG_SERIAL0 1 /* use SERIAL 0 on SMDKC100 */
/* PWM */
#define CONFIG_PWM 1
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index cce7caf..9cb34e4 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -30,7 +30,6 @@
#define S5P_CHECK_LPA 0xABAD0000
/* select serial console configuration */
-#define CONFIG_SERIAL1 1 /* use SERIAL 1 */
#define EXYNOS4_DEFAULT_UART_OFFSET 0x010000
/* allow to overwrite serial and ethaddr */
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 72da301..048b54c 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -54,7 +54,6 @@
* select serial console configuration
*/
#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1
-#define CONFIG_SERIAL1 /* UART1 */
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index e424983..add4ee0 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -53,9 +53,6 @@
/* allow overwriting serial config and ethaddr */
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_SERIAL1
-#define CONFIG_SERIAL2
-#define CONFIG_SERIAL3
/*
* GPMC NAND block. We support 1 device and the physical address to
diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h
index 3439a27..df6bca6 100644
--- a/include/configs/ti_omap3_common.h
+++ b/include/configs/ti_omap3_common.h
@@ -40,7 +40,6 @@
/* Select serial console configuration */
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
-#define CONFIG_SERIAL3 3
#endif
/* Physical Memory Map */
diff --git a/include/configs/trats.h b/include/configs/trats.h
index e6649ff..77729a1 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -34,7 +34,6 @@
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4800000)
/* select serial console configuration */
-#define CONFIG_SERIAL2
#define CONFIG_MACH_TYPE MACH_TYPE_TRATS
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index c3eb7c9..c9b192a 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -32,7 +32,6 @@
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000)
/* select serial console configuration */
-#define CONFIG_SERIAL2
/* Console configuration */
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 87eb9ac..d1a8c94 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -50,7 +50,6 @@
/* select serial console configuration */
#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
-#define CONFIG_SERIAL3 3
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
115200}
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a42b64d..295681c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1805,10 +1805,6 @@ CONFIG_SECURE_RUNTIME_RESV_SRAM_SZ
CONFIG_SECURITY
CONFIG_SEC_DEQ_TIMEOUT
CONFIG_SEC_FW_SIZE
-CONFIG_SERIAL0
-CONFIG_SERIAL1
-CONFIG_SERIAL2
-CONFIG_SERIAL3
CONFIG_SERIAL_BOOT
CONFIG_SERIAL_FLASH
CONFIG_SERIAL_HW_FLOW_CONTROL
@@ -4318,12 +4314,6 @@ CONFIG_SYS_SDRC_TR_VAL2
CONFIG_SYS_SD_VOLTAGE
CONFIG_SYS_SEC_MON_ADDR
CONFIG_SYS_SEC_MON_OFFSET
-CONFIG_SYS_SERIAL0
-CONFIG_SYS_SERIAL1
-CONFIG_SYS_SERIAL2
-CONFIG_SYS_SERIAL3
-CONFIG_SYS_SERIAL4
-CONFIG_SYS_SERIAL5
CONFIG_SYS_SERIAL_BOOT
CONFIG_SYS_SFP_ADDR
CONFIG_SYS_SFP_OFFSET
--
2.7.4
More information about the U-Boot
mailing list