This converts the following to Kconfig: CONFIG_CMD_FUSE
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
README | 1 - arch/arm/cpu/armv7/mx6/Kconfig | 1 + arch/arm/cpu/armv7/mx7/Kconfig | 2 ++ cmd/Kconfig | 8 ++++++++ configs/colibri_vf_defconfig | 1 + configs/mx51evk_defconfig | 1 + configs/sandbox_defconfig | 2 +- configs/usbarmory_defconfig | 1 + configs/vf610twr_defconfig | 1 + configs/vf610twr_nand_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/ac14xx.h | 1 - include/configs/advantech_dms-ba16.h | 1 - include/configs/apalis_imx6.h | 1 - include/configs/aria.h | 1 - include/configs/colibri_imx6.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/ge_bx50v3.h | 1 - include/configs/mecp5123.h | 1 - include/configs/mpc5121ads.h | 2 -- include/configs/mx51evk.h | 1 - include/configs/mx6_common.h | 1 - include/configs/mx7_common.h | 1 - include/configs/pdm360ng.h | 2 -- include/configs/usbarmory.h | 1 - include/configs/vf610twr.h | 1 - scripts/config_whitelist.txt | 1 - 27 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/README b/README index 4758dff0d1..ba9691a895 100644 --- a/README +++ b/README @@ -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 diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig index af6dad3aa9..5ecca47a98 100644 --- 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 diff --git a/arch/arm/cpu/armv7/mx7/Kconfig b/arch/arm/cpu/armv7/mx7/Kconfig index 8dfb4c9646..80c129019a 100644 --- 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 diff --git a/cmd/Kconfig b/cmd/Kconfig index 16cf961f3e..495080fc01 100644 --- 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 diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index 8be632fb8e..3b510c3e6d 100644 --- 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 diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index e84272d68c..8f09c04ceb 100644 --- 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 diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 720f0ee9dc..a573d52b7f 100644 --- 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 @@ -186,4 +187,3 @@ CONFIG_UNIT_TEST=y CONFIG_UT_TIME=y CONFIG_UT_DM=y CONFIG_UT_ENV=y -CONFIG_CMD_ETHSW=y diff --git a/configs/usbarmory_defconfig b/configs/usbarmory_defconfig index 43256177be..a71a75751f 100644 --- 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 diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig index 9198f65eaa..47193094dd 100644 --- 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 diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig index ba4e5965ca..f1dc19a543 100644 --- 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 diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 9b3d88a1f8..7e9983e150 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_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 */ diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index 2a46e9b864..3d3c216d61 100644 --- 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 diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index b76f376a04..f320792cfd 100644 --- 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 */ diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index c1c0f592d2..8eddb68d3b 100644 --- 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 diff --git a/include/configs/aria.h b/include/configs/aria.h index 4d946fc44a..3b5d56c6bb 100644 --- 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 diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 9c4085245a..6189a6191f 100644 --- 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 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 28383f49da..6e8cd914b3 100644 --- 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 diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 198259b3c0..f60a0298d6 100644 --- 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 */ diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index fe94e663c5..6e10cafe6e 100644 --- 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
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 7919320c88..bd7c4a64e2 100644 --- 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 diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 54bc563467..4513adf2c4 100644 --- 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 diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 21ac3fc357..1a8ab4ee33 100644 --- 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 */ diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 9a20c7732d..fe460109d1 100644 --- 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 diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h index 4bd8236b33..676d55f5e8 100644 --- 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 */ diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index f725b79cd4..e25bf99e1c 100644 --- 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 */ diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 3e7dc9b685..2460294d88 100644 --- 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 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1a62d3e362..ba8ac3ebcc 100644 --- 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