diff --git a/README b/README
index 8445d2b63ce758d6647261d343ad889f137d890c..616dd5e348d2bf0da6fe5b90ec5305a9faee773e 100644
--- a/README
+++ b/README
@@ -823,7 +823,6 @@ The following options need to be configured:
 		CONFIG_CMD_AES		  AES 128 CBC encrypt/decrypt
 		CONFIG_CMD_ASKENV	* ask for env variable
 		CONFIG_CMD_BDI		  bdinfo
-		CONFIG_CMD_BSP		* Board specific commands
 		CONFIG_CMD_BOOTD	  bootd
 		CONFIG_CMD_BOOTI	* ARM64 Linux kernel Image support
 		CONFIG_CMD_CACHE	* icache, dcache
@@ -1579,7 +1578,6 @@ The following options need to be configured:
 
 			CONFIG_SYS_DIU_ADDR
 			CONFIG_VIDEO
-			CONFIG_CMD_BMP
 			CONFIG_CFB_CONSOLE
 			CONFIG_VIDEO_SW_CURSOR
 			CONFIG_VGA_AS_SINGLE_DEVICE
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 6488701b08f0ecd4d81dbf6526cb1aff6f0be49c..049fb2724a1d229639b6bdc89f88809c170d278a 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -654,6 +654,16 @@ config CMD_BMP
 	  the image into RAM, then using this command to look at it or display
 	  it.
 
+config CMD_BSP
+	bool "Enable board-specific commands"
+	help
+	  (deprecated: instead, please define a Kconfig option for each command)
+
+	  Some boards have board-specific commands which are only enabled
+	  during developemnt and need to be turned off for production. This
+	  option provides a way to control this. The commands that are enabled
+	  vary depending on the board.
+
 config CMD_BKOPS_ENABLE
 	bool "mmc bkops enable"
 	depends on CMD_MMC
diff --git a/configs/CPCI2DP_defconfig b/configs/CPCI2DP_defconfig
index 1787a8aa48023c816eb04392a4075822ab9d22a8..96a7643ca46e2518409193086f8159f3eeacd231 100644
--- a/configs/CPCI2DP_defconfig
+++ b/configs/CPCI2DP_defconfig
@@ -10,6 +10,7 @@ CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_CMD_BSP=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_BAUDRATE=9600
diff --git a/configs/CPCI4052_defconfig b/configs/CPCI4052_defconfig
index 1d1bcf235d3a95dd1adfe2301f991610093d0faf..b4089f7709cf4940071f9bd5c855a5fd555878d2 100644
--- a/configs/CPCI4052_defconfig
+++ b/configs/CPCI4052_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
 # CONFIG_MMC is not set
diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig
index d3742c76593c7c693263e16c8b863ea3f475a2f8..d9e8b805dd2742338eb3911573d36e8751db4ddf 100644
--- a/configs/MIP405T_defconfig
+++ b/configs/MIP405T_defconfig
@@ -16,6 +16,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig
index f828b58783be1a97500088182b5e5c2fdd1c4cd0..1b6d8ae26e6cfd652fb59cc9d1c93901f3a35272 100644
--- a/configs/MIP405_defconfig
+++ b/configs/MIP405_defconfig
@@ -17,6 +17,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
diff --git a/configs/MiniFAP_defconfig b/configs/MiniFAP_defconfig
index b1bc697cc6f1b46efd4b2e55e74eff6f8ec412cc..8c186f73121d17ba738e8a51de5593ad379306f9 100644
--- a/configs/MiniFAP_defconfig
+++ b/configs/MiniFAP_defconfig
@@ -18,6 +18,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_BMP=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
diff --git a/configs/O3DNT_defconfig b/configs/O3DNT_defconfig
index 49e1fbb45e7d6c43358f4c9c249bc2f3ecb088fb..5ce41408593a6fafaa8abb1d915273e1b8ac204c 100644
--- a/configs/O3DNT_defconfig
+++ b/configs/O3DNT_defconfig
@@ -9,6 +9,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
diff --git a/configs/PATI_defconfig b/configs/PATI_defconfig
index d8262ebf0b12c4251e1204501e9285314c7e563f..fbf3227fc06811e48a2f8900a11727934be0a7f8 100644
--- a/configs/PATI_defconfig
+++ b/configs/PATI_defconfig
@@ -19,6 +19,7 @@ CONFIG_SYS_PROMPT="pati=> "
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_CMD_BSP=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set
diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig
index 1d02b9d07df2b77401cc7ee05c0fe6ef7f9de934..4fe31f1e3042ed9e2144bc669d61e835c63221c6 100644
--- a/configs/PIP405_defconfig
+++ b/configs/PIP405_defconfig
@@ -17,6 +17,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
diff --git a/configs/PMC405DE_defconfig b/configs/PMC405DE_defconfig
index 90040c73db91c50bc5376f7de84a253baa51e13c..7ac77d915b75111ab7184d552e2b30bbdad15eac 100644
--- a/configs/PMC405DE_defconfig
+++ b/configs/PMC405DE_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_BSP=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
diff --git a/configs/PMC440_defconfig b/configs/PMC440_defconfig
index ca20fc0ea9fdf982aaa55774a5cd30f7068a56b2..0cc41314412ff028e76d0568a0180dec65723978 100644
--- a/configs/PMC440_defconfig
+++ b/configs/PMC440_defconfig
@@ -17,6 +17,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
diff --git a/configs/TQM5200S_HIGHBOOT_defconfig b/configs/TQM5200S_HIGHBOOT_defconfig
index 0c4e2923dcf50c51ffc5910cfc5b1438ae09d83b..ea022e54d39c9925c4252aebbd4202548c567fdf 100644
--- a/configs/TQM5200S_HIGHBOOT_defconfig
+++ b/configs/TQM5200S_HIGHBOOT_defconfig
@@ -14,6 +14,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
diff --git a/configs/TQM5200S_defconfig b/configs/TQM5200S_defconfig
index 9ef02e3ddadf2506712da041197916e922056b62..8cddc8f9326634d06d8b0bccf54b06e140571205 100644
--- a/configs/TQM5200S_defconfig
+++ b/configs/TQM5200S_defconfig
@@ -14,6 +14,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
diff --git a/configs/TQM5200_B_HIGHBOOT_defconfig b/configs/TQM5200_B_HIGHBOOT_defconfig
index d543d17cfc4ab63c520bc61f1d5c6f442c2e5e61..b0c1252e62c5c863059e666e60d7ef2f9dcbb6d4 100644
--- a/configs/TQM5200_B_HIGHBOOT_defconfig
+++ b/configs/TQM5200_B_HIGHBOOT_defconfig
@@ -18,6 +18,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_BMP=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
diff --git a/configs/TQM5200_B_defconfig b/configs/TQM5200_B_defconfig
index 1a222f3d18ad5451328aef8c05d52df27cb6dfaa..71fb84049cfa21b378ff8bf397f6da8da6ee7a01 100644
--- a/configs/TQM5200_B_defconfig
+++ b/configs/TQM5200_B_defconfig
@@ -18,6 +18,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_BMP=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
diff --git a/configs/TQM5200_STK100_defconfig b/configs/TQM5200_STK100_defconfig
index 5f0283dc8e0230d87370d3f3ce2079ff43b7b81b..b2c14089d6dc620c8483bc7f11f9e4418d9718ab 100644
--- a/configs/TQM5200_STK100_defconfig
+++ b/configs/TQM5200_STK100_defconfig
@@ -18,6 +18,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_BMP=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
diff --git a/configs/TQM5200_defconfig b/configs/TQM5200_defconfig
index f1f1e8d167f834372677c9c1c6f35d1fff10f3eb..2cc80573a9384376b268ecea7ab4e1e38fe92407 100644
--- a/configs/TQM5200_defconfig
+++ b/configs/TQM5200_defconfig
@@ -17,6 +17,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_BMP=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
diff --git a/configs/VOM405_defconfig b/configs/VOM405_defconfig
index d0777ca9fba8237b327d10b3da6ce56f94e5eeb6..23d33a649f3aee09f0618d7efad703758854a9d5 100644
--- a/configs/VOM405_defconfig
+++ b/configs/VOM405_defconfig
@@ -11,6 +11,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_BSP=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set
diff --git a/configs/a3m071_defconfig b/configs/a3m071_defconfig
index d485a0cd933850d3a4ba7e3cfb0558d92e1f646f..8d636e03d206478c948da2e9f7cafb82558f3888 100644
--- a/configs/a3m071_defconfig
+++ b/configs/a3m071_defconfig
@@ -21,6 +21,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_LINK_LOCAL=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_UBI=y
 # CONFIG_MMC is not set
diff --git a/configs/a4m2k_defconfig b/configs/a4m2k_defconfig
index 7b99bb554968b7c64bb7ac743698c4067363d52f..c3ee19945cf1fbdcf06c043928bdc20e889fa926 100644
--- a/configs/a4m2k_defconfig
+++ b/configs/a4m2k_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_LINK_LOCAL=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_UBI=y
 # CONFIG_MMC is not set
diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
index 071ff7f8a02110e3fb84393346a60a5d9d3b3678..e22dc0743bdc8e9b2e4143be9f3903f66030cd71 100644
--- a/configs/apf27_defconfig
+++ b/configs/apf27_defconfig
@@ -18,6 +18,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DNS=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
diff --git a/configs/cam5200_defconfig b/configs/cam5200_defconfig
index 725a3b09d30ba38823abfde8a870e2fb56122a92..2c8449dfd6723fe386fdfbb86ed7b93eb4a8e4fd 100644
--- a/configs/cam5200_defconfig
+++ b/configs/cam5200_defconfig
@@ -13,6 +13,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
+CONFIG_CMD_BSP=y
 CONFIG_MAC_PARTITION=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ISO_PARTITION=y
diff --git a/configs/cam5200_niosflash_defconfig b/configs/cam5200_niosflash_defconfig
index 7bd95fae689558eb597497eecd9556bb67e8d4a1..730d7506044a036fb1ac0b241d79bbbb2d29cf09 100644
--- a/configs/cam5200_niosflash_defconfig
+++ b/configs/cam5200_niosflash_defconfig
@@ -13,6 +13,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
+CONFIG_CMD_BSP=y
 CONFIG_MAC_PARTITION=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ISO_PARTITION=y
diff --git a/configs/charon_defconfig b/configs/charon_defconfig
index 3dd15882e53f4c66a30d88b3169e4a7bfc60f651..4e2923497610162abe103519258ba363d1f7caf2 100644
--- a/configs/charon_defconfig
+++ b/configs/charon_defconfig
@@ -17,6 +17,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_BMP=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
diff --git a/configs/cm5200_defconfig b/configs/cm5200_defconfig
index 8b12a3aec231d151c2f6305524c41626c54fbff7..5f691de2d32e75e2eb13671196102813eeba26e8 100644
--- a/configs/cm5200_defconfig
+++ b/configs/cm5200_defconfig
@@ -13,6 +13,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index 1255b4f8085a28033b9bd4862b0a54f1912dec66..4d0be51f7b5f6a67fdcb429f57726577e2f2f8d7 100644
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CDP=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_DNS=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
diff --git a/configs/fo300_defconfig b/configs/fo300_defconfig
index 7a774aa58b98094c33781815c2f8ee28c89e1cfe..d0728eb65154306c143800aa94a1ebefd9e2581d 100644
--- a/configs/fo300_defconfig
+++ b/configs/fo300_defconfig
@@ -20,6 +20,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_BMP=y
+CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index 25b030f4a36614154e30ae0a5f5d429dd98a11e3..38c960014211d5b6d7e927d300583d980a1f278f 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -13,7 +13,6 @@
  * Alphabetical list of all possible commands.
  */
 
-#define CONFIG_CMD_BSP		/* Board Specific functions	*/
 #define CONFIG_CMD_CLK		/* Clock support		*/
 #define CONFIG_CMD_DATE		/* support for RTC, date/time...*/
 #define CONFIG_CMD_DIAG		/* Diagnostics			*/
diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index bc5fa0394c2d042e9d101f3cfd3b6b825399c685..c3b2353f5f1b0c9e9e37394149684a347688649a 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -47,7 +47,6 @@
  */
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_BSP
 #define CONFIG_CMD_EEPROM
 
 #undef	CONFIG_WATCHDOG			/* watchdog disabled		*/
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index feabc5fc09653773c7b3a7e0ef2eeefa35850abb..d869a5fa61171114b5320356772670396ac894b9 100644
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -64,7 +64,6 @@
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_BSP
 #define CONFIG_CMD_EEPROM
 
 #define CONFIG_SUPPORT_VFAT
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index d362197ed515481e11ba49802b44ee46c8c8ae72..bcdba714a540af2d6d57ed0768f2dab640e3cf92 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -54,7 +54,6 @@
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_SAVES
-#define CONFIG_CMD_BSP
 
 /**************************************************************
  * I2C Stuff:
diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index 2c048abba65c673aaacbf37fb8796b35ea3503df..e53db2485b83af817c086bf1098dcfe3513a1bf4 100644
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -38,7 +38,6 @@
  */
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_BSP
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_IRQ
 
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index b00cf8eeb2159b00c762258f7f9fdb4e8c887bd8..321059b7b2f7799a77b1022e5daadd05c3ed39af 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -47,7 +47,6 @@
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_SAVES
-#define CONFIG_CMD_BSP
 
 /**************************************************************
  * I2C Stuff:
diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h
index 5c3f56682cf48d65f59d43161fc58e594fb86731..a7d7bbf10b1aa0ea211469162b8d924344342f4a 100644
--- a/include/configs/PMC405DE.h
+++ b/include/configs/PMC405DE.h
@@ -48,7 +48,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_BSP
 #define CONFIG_CMD_CHIP_CONFIG
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_EEPROM
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 1b059d4f58b662849f8664a405ebb47cdf45dde2..31e95c1b65b4a9f0819ed8c84471a3c9bfcf9aa3 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -258,7 +258,6 @@
 
 /* Partitions */
 
-#define CONFIG_CMD_BSP
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 0be6820ef90b87b39d6ef88b5c8fa0689d70e7ac..0fdc62ec1490d3732e3ae982ead9be85244b5e14 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -148,7 +148,6 @@
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_BSP
 
 #ifdef CONFIG_PCI
 #define CONFIG_CMD_PCI
diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h
index 7e421155404215a8dd5fcccff012ae759ad1edcb..fbadcd17f1c358ffada1018c09d137c23fab34a8 100644
--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@@ -53,7 +53,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_BSP
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_EEPROM
 
diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h
index 60158f96d4abbdcfce09d7da39c22804796fbbd4..07f74db0899b46c2a458dc1c4024d2e6a06fb4ca 100644
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -42,7 +42,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_BSP
 #define CONFIG_CMD_REGINFO
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_BOOTP_SERVERIP
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index 82898bfa136ea9ed255012b8559a3bdaac21b8e1..151493313782ca120353bfcd516ee7dcf41d282e 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -54,7 +54,6 @@
 /*
  * U-Boot Commands
  */
-#define CONFIG_CMD_BSP		/* Board Specific functions	*/
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_IMX_FUSE	/* imx iim fuse                 */
diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index 51a5f6dce7a1292a9ace06cc52c4a19e36089024..89a2d229da5cad295faac0396c36c997181995a8 100644
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -21,7 +21,6 @@
 /*
  * Supported commands
  */
-#define CONFIG_CMD_BSP
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DIAG
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index b83eb451116119f7e988a7e06314ab5eecaaef08..2ae39c04883b05fc9beff369c417093ea063bb24 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -89,7 +89,6 @@
 #define CONFIG_CMD_NAND
 
 #ifndef MINIMAL_LOADER
-#define CONFIG_CMD_BSP
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_REISER
 #define CONFIG_CMD_SAVES
diff --git a/include/configs/o3dnt.h b/include/configs/o3dnt.h
index 77907507b3063a33b93b051ebd4a2cfc8325aeaa..f0fcedaffc3998564c5fd0870ee8765d56fffc32 100644
--- a/include/configs/o3dnt.h
+++ b/include/configs/o3dnt.h
@@ -26,7 +26,6 @@
 #include "o2dnt-common.h"
 
 /* Additional commands */
-#define CONFIG_CMD_BSP
 #define CONFIG_CMD_REGINFO
 
 /*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0e494e6c38d9385d3b65957bca4e31d123fa2493..df115d1106c4ee4407ed8d6eaa48bb5d36033340 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -393,7 +393,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_BSP
 CONFIG_CMD_CBFS
 CONFIG_CMD_CHIP_CONFIG
 CONFIG_CMD_CLEAR