fs: Convert CONFIG_CMD_CBFS to Kconfig
This converts the following to Kconfig:
CONFIG_CMD_CBFS
Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: imply CMD_CBFS on SYS_COREBOOT]
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/README b/README
index 3afffbd..2d084b2 100644
--- a/README
+++ b/README
@@ -1546,13 +1546,6 @@
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/arch/x86/cpu/coreboot/Kconfig b/arch/x86/cpu/coreboot/Kconfig
index 4b3601f..0a4a82a 100644
--- a/arch/x86/cpu/coreboot/Kconfig
+++ b/arch/x86/cpu/coreboot/Kconfig
@@ -3,6 +3,7 @@
config SYS_COREBOOT
bool
default y
+ imply CMD_CBFS
config CBMEM_CONSOLE
bool
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 049fb27..8a16ed7 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -880,6 +880,15 @@
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/sandbox_defconfig b/configs/sandbox_defconfig
index afb4d93..2dbeacc 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -52,6 +52,7 @@
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 7cc9257..56b5e68 100644
--- a/configs/sandbox_noblk_defconfig
+++ b/configs/sandbox_noblk_defconfig
@@ -55,6 +55,7 @@
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 e0ee8c2..eb70a5f 100644
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -59,6 +59,7 @@
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 b2d21ce..12fc9f3 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 0b67bb7..e422a97 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -64,10 +64,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 58e1522..56af3c7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -393,7 +393,6 @@
CONFIG_CMDLINE_EDITING
CONFIG_CMDLINE_PS_SUPPORT
CONFIG_CMDLINE_TAG
-CONFIG_CMD_CBFS
CONFIG_CMD_CHIP_CONFIG
CONFIG_CMD_CLEAR
CONFIG_CMD_CLK