diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig
index 4c953e9..ea46236 100644
--- a/configs/am43xx_evm_ethboot_defconfig
+++ b/configs/am43xx_evm_ethboot_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_AM43XX=y
 CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
+CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_MISC_INIT_R is not set
diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig
index df2ea1e..985a475 100644
--- a/configs/am43xx_evm_qspiboot_defconfig
+++ b/configs/am43xx_evm_qspiboot_defconfig
@@ -5,7 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x30000000
 CONFIG_AM43XX=y
 CONFIG_DEFAULT_DEVICE_TREE="am437x-sk-evm"
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,QSPI,QSPI_BOOT"
+CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,QSPI,QSPI_BOOT"
 CONFIG_QSPI_BOOT=y
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig
index 2b7b056..13560c2 100644
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -7,7 +7,7 @@ CONFIG_SPL=y
 CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SPL_LOAD_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
+CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_MISC_INIT_R is not set
diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig
index 02ee9d7..0df6e44 100644
--- a/configs/birdland_bav335a_defconfig
+++ b/configs/birdland_bav335a_defconfig
@@ -12,7 +12,7 @@ CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_BAV_VERSION=1
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
+CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig
index 651e414..b42ecbd 100644
--- a/configs/birdland_bav335b_defconfig
+++ b/configs/birdland_bav335b_defconfig
@@ -12,7 +12,7 @@ CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_BAV_VERSION=2
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
+CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig
index 14a49db..c56a633 100644
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -9,7 +9,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_NR_DRAM_BANKS=1
-CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
+CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 CONFIG_BOOTDELAY=-2
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 0b3f459..3ce3814 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -56,7 +56,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 b903569..e755383 100644
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -114,7 +114,6 @@ extern phys_addr_t prior_stage_fdt_address;
 /*
  * 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 282b074..740bbd4 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 4970a16..8722841 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.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/cm_t3517.h b/include/configs/cm_t3517.h
index c3ec812..c876853 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -64,7 +64,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 182066d..3375c5d 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 176af72..5f7423b 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -58,7 +58,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 4bc0eca..453dd32 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -72,7 +72,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 b1fc7c8..ad77242 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -36,7 +36,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 6239677..f683ee4 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 0133416..04bce2f 100644
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -198,8 +198,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 4e2eaa9..5a82cbe 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -33,7 +33,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 ece6f6d..1acc42f 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -29,7 +29,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 2261c7a..a732e06 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 6a36536..6c5960c 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 c54d500..48f1f7b 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 9ce45f2..ef662d7 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 517bf2d..87ddc20 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 92b0abb..999bdd1 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -23,7 +23,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 23a921d..d8ed02b 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -82,7 +82,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 e2d4f30..14ec099 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 ba9a8bf..b934ee7 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 4eb4c60..6da7137 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 0b35442..dd71d89 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -51,7 +51,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 1395ab4..e622f4a 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 6d16fc7..dcf7630 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 5df5f87..223fce4 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -32,7 +32,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 b1eaf0a..f1e4cba 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -30,7 +30,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 cba4903..13307fc 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -47,7 +47,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 63dd154..6bec453 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1722,10 +1722,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