diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index b6691feb681c652930e9d9dd8dd3e6a96fc0dc52..7fe51c2c0b62fa4754ead6f6657eca2fc65409d5 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -21,8 +21,6 @@
 #define CONFIG_SYS_AT91_MAIN_CLOCK	16367660 /* 16.367 MHz crystal */
 #define CONFIG_SYS_AT91_SLOW_CLOCK	32768
 
-#define CONFIG_AT91SAM9263EK	1	/* It's an AT91SAM9263EK Board */
-
 #define CONFIG_ARCH_CPU_INIT
 
 #define CONFIG_CMDLINE_TAG	1	/* enable passing of ATAGs	*/
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 08c8f48bb581e28609c2f77c449a290b5a6634aa..6f8fd2a035ffc679622173682cd471ffb712d5cd 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -17,8 +17,6 @@
 #define CONFIG_SYS_AT91_SLOW_CLOCK	32768		/* slow clock xtal */
 #define CONFIG_SYS_AT91_MAIN_CLOCK	12000000	/* main clock xtal */
 
-#define CONFIG_AT91SAM9RLEK		1	/* It's an AT91SAM9RLEK Board */
-
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
diff --git a/include/configs/draco.h b/include/configs/draco.h
index 3278196b3afb2c1f26e6574970a56f54c40dcda5..c1816409a986ef653da8146ab241637158bccb05 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -13,7 +13,6 @@
 #ifndef __CONFIG_DRACO_H
 #define __CONFIG_DRACO_H
 
-#define CONFIG_SIEMENS_DRACO
 #define CONFIG_SIEMENS_MACH_TYPE	MACH_TYPE_DRACO
 
 #include "siemens-am33x-common.h"
diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index 6e024d1b2fd8282e2ebb3e246afdcc8f876f12ac..18ec6cb7583399499209050c978b666c749e8da6 100644
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -34,7 +34,6 @@
 #define CONFIG_SYS_LDSCRIPT	"board/cirrus/edb93xx/u-boot.lds"
 
 #ifdef CONFIG_EDB9301
-#define CONFIG_EP9301
 #define CONFIG_MACH_TYPE		MACH_TYPE_EDB9301
 #define CONFIG_ENV_SECT_SIZE		0x00020000
 #elif defined(CONFIG_EDB9302)
diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index 608f5eec32f4f056efe0b624d0b9225d2587cca9..4b380beee2720324976ed3f5a44568d0a1f23b19 100644
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -12,7 +12,6 @@
 #define CONFIG_MACH_TYPE		MACH_TYPE_H2200
 
 #define CONFIG_CPU_PXA25X		1
-#define CONFIG_BOARD_H2200
 
 #define CONFIG_NR_DRAM_BANKS		1
 #define PHYS_SDRAM_1			0xa0000000 /* SDRAM Bank #1 */
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index 82ab24c688bfc5fc3aac6afac006b5caeb431284..c8e99513f0a0ba00c393dcacd70629fe72fb8baa 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -19,7 +19,6 @@
  * Board
  */
 #define CONFIG_DRIVER_TI_EMAC
-#define CONFIG_BARIX_IPAM390
 
 /*
  * SoC Configuration
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 0d8de370dd969e7b65eb20882561946c9ff5f116..82984f4d17e6f48da8e8a2bccb4e8f57582d928a 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -11,7 +11,6 @@
 #undef DEBUG
 
 #define CONFIG_SH73A0
-#define CONFIG_KZM_A9_GT
 #define CONFIG_ARCH_RMOBILE_BOARD_STRING	"KMC KZM-A9-GT"
 #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G
 
diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index 06ee8e7f9ef9805539e55b4bc91260d3fccf9c71..0d4fc119ac6e7b2b04b8dcf3f2ef12c35006bb7c 100644
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -22,8 +22,6 @@
 #define CONFIG_SYS_AT91_SLOW_CLOCK      32768
 #define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
 
-#define CONFIG_PICOSAM
-
 #define CONFIG_CMDLINE_TAG		/* enable passing of ATAGs	*/
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
diff --git a/include/configs/platinum_picon.h b/include/configs/platinum_picon.h
index 36795304195b837fa20f3175f9aa44570bbad8f2..20315546aae84f8114a404aaa6bfa3724bee83aa 100644
--- a/include/configs/platinum_picon.h
+++ b/include/configs/platinum_picon.h
@@ -7,7 +7,6 @@
 #ifndef __PLATINUM_PICON_CONFIG_H__
 #define __PLATINUM_PICON_CONFIG_H__
 
-#define CONFIG_PLATINUM_PICON
 #define CONFIG_PLATINUM_BOARD			"Barco Picon"
 #define CONFIG_PLATINUM_PROJECT			"picon"
 #define CONFIG_PLATINUM_CPU			"imx6dl"
diff --git a/include/configs/platinum_titanium.h b/include/configs/platinum_titanium.h
index 69406a4b65eed8b49cec3ee3b51f268b3e179695..09b9bd38ff458b42baaafc5f64949d7b958914f0 100644
--- a/include/configs/platinum_titanium.h
+++ b/include/configs/platinum_titanium.h
@@ -7,7 +7,6 @@
 #ifndef __PLATINUM_TITANIUM_CONFIG_H__
 #define __PLATINUM_TITANIUM_CONFIG_H__
 
-#define CONFIG_PLATINUM_TITANIUM
 #define CONFIG_PLATINUM_BOARD			"Barco Titanium"
 #define CONFIG_PLATINUM_PROJECT			"titanium"
 #define CONFIG_PLATINUM_CPU			"imx6q"
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index d2702b4f2d6382c36d6e35b35da2a312580e3d49..e1e9af07ec35d09808dde91b99fc3bfcf4127ed1 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -27,7 +27,6 @@
 #define CONFIG_SYS_AT91_MAIN_CLOCK	18432000
 
 #define CONFIG_SYS_AT91_CPU_NAME	"AT91SAM9261"
-#define CONFIG_PM9261		1	/* on a Ronetix PM9261 Board	*/
 #define CONFIG_ARCH_CPU_INIT
 
 #define CONFIG_MACH_TYPE	MACH_TYPE_PM9261
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index c4990883af266945b6457623303ff0d6c1a0401a..880c3f118df300f46ed93776c931811495a3b563 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -27,7 +27,6 @@
 #define CONFIG_SYS_AT91_SLOW_CLOCK	32768		/* slow clock xtal */
 
 #define CONFIG_SYS_AT91_CPU_NAME	"AT91SAM9263"
-#define CONFIG_PM9263		1	/* on a Ronetix PM9263 Board	*/
 #define CONFIG_ARCH_CPU_INIT
 
 #define CONFIG_MACH_TYPE	MACH_TYPE_PM9263
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 21c31daadd52e2a30711e830de6f426b62df8b73..5612f5f358ebe128b4edd65d31608d18e3affe78 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -22,7 +22,6 @@
  */
 #include <asm/hardware.h>
 
-#define CONFIG_PM9G45		1	/* It's an Ronetix PM9G45 */
 #define CONFIG_SYS_AT91_CPU_NAME	"AT91SAM9G45"
 
 #define CONFIG_MACH_TYPE	MACH_TYPE_PM9G45
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 157b32a6a43d1e48236fc1a47226c89cdafa3670..2ad0c3018e66c2bc877a33b968aa105d776e545b 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -14,7 +14,6 @@
 #ifndef __CONFIG_PXM2_H
 #define __CONFIG_PXM2_H
 
-#define CONFIG_SIEMENS_PXM2
 #define CONFIG_SIEMENS_MACH_TYPE	MACH_TYPE_PXM2
 
 #include "siemens-am33x-common.h"
diff --git a/include/configs/rut.h b/include/configs/rut.h
index 71078e99806e4e8e94f812c7d0a1cf04ca6f0151..46f48009dd32e2ae3dd1787ef11c7d741ac10dd0 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -14,7 +14,6 @@
 #ifndef __CONFIG_RUT_H
 #define __CONFIG_RUT_H
 
-#define CONFIG_SIEMENS_RUT
 #define CONFIG_SIEMENS_MACH_TYPE	MACH_TYPE_RUT
 
 #include "siemens-am33x-common.h"
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 8a0718e3de16ef93a44810909e903ad588df4462..5b3be6d53299b9d7d91195d8d0550bc39a55412f 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -19,7 +19,6 @@
 #define CONFIG_SAMSUNG		1	/* in a SAMSUNG core */
 #define CONFIG_S5P		1	/* which is in a S5P Family */
 #define CONFIG_S5PC100		1	/* which is in a S5PC100 */
-#define CONFIG_SMDKC100		1	/* working with SMDKC100 */
 
 #include <asm/arch/cpu.h>		/* get chip and board defs */
 
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index cce7cafdb491ff280572b7c7bacf65c442e31f96..d7e73c33e744a1445b801cba2048d74127b928e8 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -17,7 +17,6 @@
 
 /* High Level Configuration Options */
 #define CONFIG_EXYNOS4210		1	/* which is a EXYNOS4210 SoC */
-#define CONFIG_SMDKV310			1	/* working with SMDKV310*/
 
 /* Mach Type */
 #define CONFIG_MACH_TYPE		MACH_TYPE_SMDKV310
diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index 2f59f52ee15e4b26b5f1914142e4e0bcad4dd102..4c4e72763e128dfdfa5c0689678943d0c78d1859 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -8,8 +8,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_STM32F4DISCOVERY
-
 #define CONFIG_MISC_INIT_R
 
 #define CONFIG_SYS_FLASH_BASE		0x08000000
diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h
index 3d4ca7ee5515b4f6922154c41f72d2d2d3777d5a..990653beb8f9ac1dbf0f5d0a7d2eb504fd0e9778 100644
--- a/include/configs/stm32f469-discovery.h
+++ b/include/configs/stm32f469-discovery.h
@@ -8,8 +8,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_STM32F4DISCOVERY
-
 #define CONFIG_MISC_INIT_R
 
 #define CONFIG_SYS_FLASH_BASE		0x08000000
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 6ea78bd14ecc78cfea30685b4b00b94f3577d6b4..a364b6080379d6775aa7ec1fcdee174abf7b8a52 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -78,7 +78,6 @@ CONFIG_AT91RM9200
 CONFIG_AT91RM9200EK
 CONFIG_AT91SAM9260EK
 CONFIG_AT91SAM9261EK
-CONFIG_AT91SAM9263EK
 CONFIG_AT91SAM9G10
 CONFIG_AT91SAM9G10EK
 CONFIG_AT91SAM9G20EK
@@ -86,7 +85,6 @@ CONFIG_AT91SAM9G20EK_2MMC
 CONFIG_AT91SAM9G45EKES
 CONFIG_AT91SAM9G45_LCD_BASE
 CONFIG_AT91SAM9M10G45EK
-CONFIG_AT91SAM9RLEK
 CONFIG_AT91SAM9_WATCHDOG
 CONFIG_AT91_CAN
 CONFIG_AT91_EFLASH
@@ -109,7 +107,6 @@ CONFIG_ATMEL_SPI0
 CONFIG_AT_TRANS
 CONFIG_AUTO_ZRELADDR
 CONFIG_BACKSIDE_L2_CACHE
-CONFIG_BARIX_IPAM390
 CONFIG_BAT_PAIR
 CONFIG_BAT_RW
 CONFIG_BCH_CONST_M
@@ -132,7 +129,6 @@ CONFIG_BOARD_AXM
 CONFIG_BOARD_COMMON
 CONFIG_BOARD_EARLY_INIT_R
 CONFIG_BOARD_ECC_SUPPORT
-CONFIG_BOARD_H2200
 CONFIG_BOARD_IS_OPENRD_BASE
 CONFIG_BOARD_IS_OPENRD_CLIENT
 CONFIG_BOARD_IS_OPENRD_ULTIMATE
@@ -544,7 +540,6 @@ CONFIG_ENV_UBI_MTD
 CONFIG_ENV_UBI_VOLUME_REDUND
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 CONFIG_ENV_VERSION
-CONFIG_EP9301
 CONFIG_EP9302
 CONFIG_EP9307
 CONFIG_EP9312
@@ -1165,7 +1160,6 @@ CONFIG_KVM_GUEST
 CONFIG_KW88F6192
 CONFIG_KW88F6281
 CONFIG_KW88F6702
-CONFIG_KZM_A9_GT
 CONFIG_L1_INIT_RAM
 CONFIG_L2_CACHE
 CONFIG_LAN91C96_USE_32_BIT
@@ -1561,7 +1555,6 @@ CONFIG_PHY_MAX_ADDR
 CONFIG_PHY_MODE_NEED_CHANGE
 CONFIG_PHY_RESET
 CONFIG_PHY_RESET_DELAY
-CONFIG_PICOSAM
 CONFIG_PIGGY_MAC_ADRESS_OFFSET
 CONFIG_PIXIS_BRDCFG0_SPI
 CONFIG_PIXIS_BRDCFG0_USB2
@@ -1578,15 +1571,10 @@ CONFIG_PL01x_PORTS
 CONFIG_PLATFORM_ENV_SETTINGS
 CONFIG_PLATINUM_BOARD
 CONFIG_PLATINUM_CPU
-CONFIG_PLATINUM_PICON
 CONFIG_PLATINUM_PROJECT
-CONFIG_PLATINUM_TITANIUM
 CONFIG_PLL1_CLK_FREQ
 CONFIG_PLL1_DIV2_CLK_FREQ
 CONFIG_PM
-CONFIG_PM9261
-CONFIG_PM9263
-CONFIG_PM9G45
 CONFIG_PMC_BR_PRELIM
 CONFIG_PMC_OR_PRELIM
 CONFIG_PMECC_CAP
@@ -1865,10 +1853,7 @@ CONFIG_SH_SDHI_FREQ
 CONFIG_SH_SDRAM_OFFSET
 CONFIG_SH_SPI_BASE
 CONFIG_SH_TMU_CLK_FREQ
-CONFIG_SIEMENS_DRACO
 CONFIG_SIEMENS_MACH_TYPE
-CONFIG_SIEMENS_PXM2
-CONFIG_SIEMENS_RUT
 CONFIG_SIMU
 CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION
 CONFIG_SKIP_LOWLEVEL_INIT
@@ -1883,8 +1868,6 @@ CONFIG_SMC_AUTONEG_TIMEOUT
 CONFIG_SMC_USE_32_BIT
 CONFIG_SMC_USE_IOFUNCS
 CONFIG_SMDK5420
-CONFIG_SMDKC100
-CONFIG_SMDKV310
 CONFIG_SMP_PEN_ADDR
 CONFIG_SMSC_LPC47M
 CONFIG_SMSC_SIO1007
@@ -2072,7 +2055,6 @@ CONFIG_STACKBASE
 CONFIG_STANDALONE_LOAD_ADDR
 CONFIG_STATIC_BOARD_REV
 CONFIG_STD_DEVICES_SETTINGS
-CONFIG_STM32F4DISCOVERY
 CONFIG_STM32_FLASH
 CONFIG_STM32_HZ
 CONFIG_STRIDER