[U-Boot] [PATCH] Removed unused references to CONFIG_SERIALx

Adam Ford aford173 at gmail.com
Tue Aug 7 12:08:32 UTC 2018


After creating CONS_INDEX and migrating a bunch of boards to it,
there are a bunch of defined references to CONFIG_SERIALx which
are not referenced in any C code or #ifdef, so they can now be
removed

Signed-off-by: Adam Ford <aford173 at gmail.com>
---
 include/configs/am3517_crane.h         | 1 -
 include/configs/bcmstb.h               | 1 -
 include/configs/cm_t335.h              | 1 -
 include/configs/cm_t35.h               | 1 -
 include/configs/cm_t3517.h             | 1 -
 include/configs/eco5pk.h               | 2 --
 include/configs/mcx.h                  | 1 -
 include/configs/nokia_rx51.h           | 1 -
 include/configs/odroid.h               | 1 -
 include/configs/odroid_xu3.h           | 1 -
 include/configs/omap3_cairo.h          | 2 --
 include/configs/omap3_pandora.h        | 1 -
 include/configs/origen.h               | 1 -
 include/configs/peach-pi.h             | 1 -
 include/configs/peach-pit.h            | 1 -
 include/configs/pengwyn.h              | 1 -
 include/configs/pepper.h               | 1 -
 include/configs/s5p_goni.h             | 1 -
 include/configs/s5pc210_universal.h    | 1 -
 include/configs/siemens-am33x-common.h | 1 -
 include/configs/smdk5420.h             | 1 -
 include/configs/smdkc100.h             | 1 -
 include/configs/smdkv310.h             | 1 -
 include/configs/tam3517-common.h       | 1 -
 include/configs/ti816x_evm.h           | 3 ---
 include/configs/ti_omap3_common.h      | 1 -
 include/configs/trats.h                | 1 -
 include/configs/trats2.h               | 1 -
 include/configs/tricorder.h            | 1 -
 scripts/config_whitelist.txt           | 4 ----
 30 files changed, 37 deletions(-)

diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index ffe40a4160..17b3e5c90d 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -58,7 +58,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/bcmstb.h b/include/configs/bcmstb.h
index 8c6178042e..99911ba8b1 100644
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -106,7 +106,6 @@
 /*
  * Serial console configuration.
  */
-#define CONFIG_SERIAL3			3
 
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600, \
diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index 282b0747e1..740bbd45a0 100644
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -79,7 +79,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 415924549b..c755f63055 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -62,7 +62,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 2c889d4a85..05f957eb4c 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -66,7 +66,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 182066d4d4..3375c5d965 100644
--- a/include/configs/eco5pk.h
+++ b/include/configs/eco5pk.h
@@ -16,10 +16,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 0cad187a3c..f67bc08922 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -60,7 +60,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 40e735101b..d4353e15a7 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -73,7 +73,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 92811cfc54..88062400a5 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -37,7 +37,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 f495f6219b..13945dfef4 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -15,7 +15,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 72f04c3c18..2410f7d56a 100644
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -203,8 +203,6 @@
  * function per_clocks_enable().
  */
 #ifdef CONFIG_SPL_BUILD
-#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 9259282729..68e1d6f82d 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -37,7 +37,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 65e1c7c0c7..b051a0414e 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -30,7 +30,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 d90eb14f6f..5b633f2e9d 100644
--- a/include/configs/peach-pi.h
+++ b/include/configs/peach-pi.h
@@ -24,7 +24,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 b87b36a9c6..eb63cecc61 100644
--- a/include/configs/peach-pit.h
+++ b/include/configs/peach-pit.h
@@ -24,7 +24,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 c54d50096f..48f1f7bacc 100644
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -10,7 +10,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 9ce45f2777..ef662d7000 100644
--- a/include/configs/pepper.h
+++ b/include/configs/pepper.h
@@ -70,7 +70,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 80bd8b845e..d6765bbacb 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -39,7 +39,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 baa19b0dc3..93b6a7992d 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -24,7 +24,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 97903a08e1..ed0bba6608 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -83,7 +83,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 dd7ded6d7a..afa9b6ff7d 100644
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.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"
 
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC1,115200n8\0"
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index aa43798c42..8600aeacd4 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -44,7 +44,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 3446489e14..aa86e47330 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -28,7 +28,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 a7d3d0822b..e40773a6dc 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -53,7 +53,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 68400a86fc..5feb1669b6 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -52,9 +52,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 6d16fc782b..dcf76305db 100644
--- a/include/configs/ti_omap3_common.h
+++ b/include/configs/ti_omap3_common.h
@@ -41,7 +41,6 @@
 #define CONFIG_SYS_NS16550_COM1		OMAP34XX_UART1
 #define CONFIG_SYS_NS16550_COM2		OMAP34XX_UART2
 #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 f68a70e4b1..a0334a953f 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -33,7 +33,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 020dd76eb7..e210e45de0 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -31,7 +31,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 95c3ea9ce4..c4bb9f04be 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -49,7 +49,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 0d60da3f28..e3930b964a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1735,10 +1735,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
-- 
2.17.1



More information about the U-Boot mailing list