Convert CONFIG_CMD_BSP to Kconfig

This converts the following to Kconfig: CONFIG_CMD_BSP Signed-off-by: Simon Glass <sjg@chromium.org>
2017-04-26 22:27:56 -06:00 · 2017-04-26 22:27:56 -06:00 · 4893e34b00
commit 4893e34b00
parent 0f7102588c
44 changed files with 36 additions and 18 deletions
--- a/2
+++ b/2
@ -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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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			*/
--- 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		*/
--- 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
--- 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:
--- 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

--- 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:
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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                 */
--- 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
--- 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
--- 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

 /*
--- 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