Convert CONFIG_CMD_FUSE to Kconfig

This converts the following to Kconfig: CONFIG_CMD_FUSE Signed-off-by: Simon Glass <sjg@chromium.org>
2017-05-17 03:25:22 -06:00 · 2017-05-17 03:25:22 -06:00 · 51f2937036
commit 51f2937036
parent fe7604a3bc
27 changed files with 17 additions and 21 deletions
--- a/1
+++ b/1
@ -844,7 +844,6 @@ The following options need to be configured:
 		CONFIG_CMD_FAT		* FAT command support
 		CONFIG_CMD_FLASH	  flinfo, erase, protect
 		CONFIG_CMD_FPGA		  FPGA device initialization support
-		CONFIG_CMD_FUSE		* Device fuse support
 		CONFIG_CMD_GETTIME	* Get time since boot
 		CONFIG_CMD_GO		* the 'go' command (exec code)
 		CONFIG_CMD_GREPENV	* search environment
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@ -7,6 +7,7 @@ config MX6
 	select ARM_ERRATA_751472 if !MX6UL
 	select ARM_ERRATA_761320 if !MX6UL
 	select ARM_ERRATA_794072 if !MX6UL
+	imply CMD_FUSE

 config MX6D
 	bool
--- a/arch/arm/cpu/armv7/mx7/Kconfig
+++ b/arch/arm/cpu/armv7/mx7/Kconfig
@ -6,10 +6,12 @@ config MX7
 	select CPU_V7_HAS_VIRT
 	select CPU_V7_HAS_NONSEC
 	select ARCH_SUPPORT_PSCI
+	imply CMD_FUSE
 	default y

 config MX7D
 	select ROM_UNIFIED_SECTIONS
+	imply CMD_FUSE
 	bool

 choice
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@ -627,6 +627,14 @@ config CMD_FPGAD
 	  fpga_get_reg() function. This functions similarly to the 'md'
 	  command.

+config CMD_FUSE
+	bool "fuse - support for the fuse subssystem"
+	help
+	  (deprecated - needs conversion to driver model)
+	  This allows reading, sensing, programming or overriding fuses
+	  which control the behaviour of the device. The command uses the
+	  fuse_...() API.
+
 config CMD_REMOTEPROC
 	bool "remoteproc"
 	depends on REMOTEPROC
--- a/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@ -21,6 +21,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_CMD_FUSE=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
--- a/configs/mx51evk_defconfig
+++ b/configs/mx51evk_defconfig
@ -14,6 +14,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_FUSE=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@ -44,6 +44,7 @@ CONFIG_CMD_CDP=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_DNS=y
 CONFIG_CMD_LINK_LOCAL=y
+CONFIG_CMD_ETHSW=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y
@ -184,6 +185,5 @@ CONFIG_UNIT_TEST=y
 CONFIG_UT_TIME=y
 CONFIG_UT_DM=y
 CONFIG_UT_ENV=y
-CONFIG_CMD_ETHSW=y
 CONFIG_WDT=y
 CONFIG_WDT_SANDBOX=y
--- a/configs/usbarmory_defconfig
+++ b/configs/usbarmory_defconfig
@ -8,6 +8,7 @@ CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_FUSE=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
--- a/configs/vf610twr_defconfig
+++ b/configs/vf610twr_defconfig
@ -10,6 +10,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_FUSE=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
--- a/configs/vf610twr_nand_defconfig
+++ b/configs/vf610twr_nand_defconfig
@ -10,6 +10,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_FUSE=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=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_FUSE		/* Device fuse support		*/
 #define CONFIG_CMD_GETTIME	/* Get time since boot         */
 #define CONFIG_CMD_HASH		/* calculate hash / digest	*/
 #define CONFIG_CMD_IDE		/* IDE harddisk support		*/
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@ -367,7 +367,6 @@
 #define CONFIG_LOADS_ECHO		1
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	1

-#undef CONFIG_CMD_FUSE
 #undef CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_REGINFO
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@ -36,7 +36,6 @@
 #define CONFIG_MXC_GPIO
 #define CONFIG_MXC_UART

-#define CONFIG_CMD_FUSE
 #define CONFIG_MXC_OCOTP

 /* SATA Configs */
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@ -54,7 +54,6 @@
 #define CONFIG_SYS_I2C_SPEED		100000

 /* OCOTP Configs */
-#define CONFIG_CMD_FUSE
 #ifdef CONFIG_CMD_FUSE
 #define CONFIG_MXC_OCOTP
 #endif
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@ -372,7 +372,6 @@
 #define CONFIG_LOADS_ECHO		1
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	1

-#undef CONFIG_CMD_FUSE
 #undef CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_REGINFO
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@ -52,7 +52,6 @@
 #define CONFIG_SYS_I2C_SPEED		100000

 /* OCOTP Configs */
-#define CONFIG_CMD_FUSE
 #ifdef CONFIG_CMD_FUSE
 #define CONFIG_MXC_OCOTP
 #endif
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@ -20,7 +20,6 @@

 #define CONFIG_SKIP_LOWLEVEL_INIT

-#define CONFIG_CMD_FUSE
 #ifdef CONFIG_CMD_FUSE
 #define CONFIG_MXC_OCOTP
 #endif
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@ -47,7 +47,6 @@
 #define CONFIG_MXC_GPIO
 #define CONFIG_MXC_UART

-#define CONFIG_CMD_FUSE
 #define CONFIG_MXC_OCOTP

 /* SATA Configs */
--- a/include/configs/mecp5123.h
+++ b/include/configs/mecp5123.h
@ -273,7 +273,6 @@
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change	*/

 #define CONFIG_CMD_REGINFO
-#undef CONFIG_CMD_FUSE
 #undef CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2

--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@ -382,8 +382,6 @@
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_REGINFO

-#undef CONFIG_CMD_FUSE
-
 #if defined(CONFIG_PCI)
 #define CONFIG_CMD_PCI
 #endif
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@ -33,7 +33,6 @@
 * Hardware drivers
 */
 #define CONFIG_FSL_IIM
-#define CONFIG_CMD_FUSE

 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE	UART1_BASE
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@ -78,7 +78,6 @@
 #define CONFIG_FSL_USDHC

 /* Fuses */
-#define CONFIG_CMD_FUSE
 #define CONFIG_MXC_OCOTP

 /* Secure boot (HAB) support */
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@ -59,7 +59,6 @@
 #define CONFIG_FSL_USDHC

 /* Fuses */
-#define CONFIG_CMD_FUSE
 #define CONFIG_MXC_OCOTP

 #define CONFIG_ARMV7_SECURE_BASE	0x00900000
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@ -340,8 +340,6 @@

 #define CONFIG_CMD_REGINFO

-#undef CONFIG_CMD_FUSE
-
 /*
 * Miscellaneous configurable options
 */
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@ -53,7 +53,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */

 /* Fuse */
-#define CONFIG_CMD_FUSE
 #define CONFIG_FSL_IIM

 /* U-Boot memory offsets */
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@ -20,7 +20,6 @@
 /* Enable passing of ATAGs */
 #define CONFIG_CMDLINE_TAG

-#define CONFIG_CMD_FUSE
 #ifdef CONFIG_CMD_FUSE
 #define CONFIG_MXC_OCOTP
 #endif
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@ -383,7 +383,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_FUSE
 CONFIG_CMD_GETTIME
 CONFIG_CMD_GSC
 CONFIG_CMD_HASH