This converts the following to Kconfig: CONFIG_CMD_CBFS
Signed-off-by: Simon Glass sjg@chromium.org ---
README | 7 ------- cmd/Kconfig | 9 +++++++++ configs/coreboot-x86_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_noblk_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + include/configs/sandbox.h | 1 - include/configs/x86-common.h | 4 ---- scripts/config_whitelist.txt | 1 - 9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/README b/README index 3afffbde1c..2d084b2cbb 100644 --- a/README +++ b/README @@ -1546,13 +1546,6 @@ The following options need to be configured: This will also enable the command "fatwrite" enabling the user to write files to FAT.
-- CBFS (Coreboot Filesystem) support: - CONFIG_CMD_CBFS - - Define this to enable support for reading from a Coreboot - filesystem. Available commands are cbfsinit, cbfsinfo, cbfsls - and cbfsload. - - FAT(File Allocation Table) filesystem cluster size: CONFIG_FS_FAT_MAX_CLUSTSIZE
diff --git a/cmd/Kconfig b/cmd/Kconfig index 6563b30082..d16f591c91 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -878,6 +878,15 @@ config CMD_CROS_EC endmenu
menu "Filesystem commands" +config CMD_CBFS + bool "Enable the 'cbfs' command" + help + Define this to enable support for reading from a Coreboot + filesystem. This is a ROM-based filesystem used for accessing files + on systems that use coreboot as the first boot-loader and then load + U-Boot to actually boot the Operating System. Available commands are + cbfsinit, cbfsinfo, cbfsls and cbfsload. + config CMD_EXT2 bool "ext2 command support" help diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig index 90cf139a79..11d64af7f2 100644 --- a/configs/coreboot-x86_defconfig +++ b/configs/coreboot-x86_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_BOOTSTAGE=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y +CONFIG_CMD_CBFS=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index fcc1fa045a..d8421305d8 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -52,6 +52,7 @@ CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y +CONFIG_CMD_CBFS=y CONFIG_CMD_EXT4_WRITE=y CONFIG_MAC_PARTITION=y CONFIG_AMIGA_PARTITION=y diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig index dd75133bf1..34db812f64 100644 --- a/configs/sandbox_noblk_defconfig +++ b/configs/sandbox_noblk_defconfig @@ -55,6 +55,7 @@ CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y +CONFIG_CMD_CBFS=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 85ee99ac1b..9cda93071a 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -59,6 +59,7 @@ CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y +CONFIG_CMD_CBFS=y CONFIG_CMD_EXT4_WRITE=y CONFIG_MAC_PARTITION=y CONFIG_AMIGA_PARTITION=y diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 1865dcdcea..0af77ea431 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -35,7 +35,6 @@ #define CONFIG_FAT_WRITE #define CONFIG_FS_EXT4 #define CONFIG_EXT4_WRITE -#define CONFIG_CMD_CBFS #define CONFIG_CMD_CRAMFS #define CONFIG_HOST_MAX_DEVICES 4
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index d69e609bd9..b670c31cc4 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -65,10 +65,6 @@
#define CONFIG_SUPPORT_VFAT
-#ifdef CONFIG_SYS_COREBOOT -#define CONFIG_CMD_CBFS -#endif - /* x86 GPIOs are accessed through a PCI device */ #define CONFIG_INTEL_ICH6_GPIO
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index afaa30eddc..ce888c7928 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_CBFS CONFIG_CMD_CHIP_CONFIG CONFIG_CMD_CLEAR CONFIG_CMD_CLK