diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 19d1bc1951137288ed6d11d62bf5e1256c660572..5de39cf740f0ced7fed929ccdd89b01e087fd3af 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -16,8 +16,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_OMAP3_AM3517CRANE	1	/* working with CRANEBOARD */
-
 #define CONFIG_EMIF4	/* The chip has EMIF4 controller */
 
 #include <asm/arch/cpu.h>		/* get chip and board defs */
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index e72cee0c000db80a75290e53bfa3501bb26faf59..5884d5c67c18747ac01d876cbc8fdf42affe2cc6 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -16,7 +16,6 @@
 #define __CONFIG_H
 
 /* High Level Configuration Options */
-#define CONFIG_OMAP3_DEVKIT8000	1	/* working with DevKit8000 */
 #define CONFIG_MACH_TYPE	MACH_TYPE_DEVKIT8000
 
 /*
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 44d3fa3c10c6b1fe4aac48ac2db477ea7894a926..a72696dd683f0f46cb1b0890364004b5fbbbbdc9 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -12,7 +12,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_OMAP3_MCX		/* working with mcx */
 #define CONFIG_OMAP_GPIO
 
 #define CONFIG_MACH_TYPE	MACH_TYPE_MCX
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 99d3189b3fa92ab02a33c6f543e6a0321b3bee4c..e323ea322132c284e76c7555e345e0f21caf165d 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -22,7 +22,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_OMAP3_RX51		/* working with RX51 */
 #define CONFIG_SYS_L2CACHE_OFF		/* pretend there is no L2 CACHE */
 
 #define CONFIG_MACH_TYPE		MACH_TYPE_NOKIA_RX51
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index aa27a9e68a42af39e685a79e33730be42aa2fd7c..6c869c4c07b799e43a012306f6f4dee4fbeee360 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -13,11 +13,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/*
- * High Level Configuration Options
- */
-#define CONFIG_OMAP3_ZOOM1	1	/* working with Zoom MDK Rev1 */
-
 #define CONFIG_NAND
 #define CONFIG_NR_DRAM_BANKS	2	/* CS1 may or may not be populated */
 #include <asm/arch/cpu.h>		/* get chip and board defs */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 93ee3035d183e7dcfbd7c90d1f6d9928acffd862..b9676aa71f26479378265f5edc5f5ebe7807d850 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1979,19 +1979,14 @@ CONFIG_OF_SPI
 CONFIG_OF_SPI_FLASH
 CONFIG_OF_STDOUT_PATH
 CONFIG_OF_SUPPORT_OLD_DEVICE_TREES
-CONFIG_OMAP3_AM3517CRANE
-CONFIG_OMAP3_DEVKIT8000
 CONFIG_OMAP3_GPIO_2
 CONFIG_OMAP3_GPIO_3
 CONFIG_OMAP3_GPIO_4
 CONFIG_OMAP3_GPIO_5
 CONFIG_OMAP3_GPIO_6
 CONFIG_OMAP3_LOGIC_USE_NEW_PRODUCT_ID
-CONFIG_OMAP3_MCX
 CONFIG_OMAP3_MICRON_DDR
-CONFIG_OMAP3_RX51
 CONFIG_OMAP3_SPI_D0_D1_SWAPPED
-CONFIG_OMAP3_ZOOM1
 CONFIG_OMAP_EHCI_PHY1_RESET_GPIO
 CONFIG_OMAP_EHCI_PHY2_RESET_GPIO
 CONFIG_OMAP_EHCI_PHY3_RESET_GPIO