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 3afffbde1c5ce99575cae1131a96e185fabe8668..2d084b2cbbffc26f071a673316b050d7e7067076 100644 (file)
--- 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/arch/x86/cpu/coreboot/Kconfig b/arch/x86/cpu/coreboot/Kconfig
index 4b3601f66d9d64544eb1457fb6624c140f386be8..0a4a82ad13fe0e98fdd64bbc0a1335d9a21ba93e 100644 (file)
--- a/arch/x86/cpu/coreboot/Kconfig
+++ b/arch/x86/cpu/coreboot/Kconfig
@@ -3,6 +3,7 @@ if TARGET_COREBOOT
 config SYS_COREBOOT
        bool
        default y
+       imply CMD_CBFS
 
 config CBMEM_CONSOLE
        bool

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 049fb2724a1d229639b6bdc89f88809c170d278a..8a16ed77a89902fcb6620a8e363cbbcfe6b2771e 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -880,6 +880,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/sandbox_defconfig b/configs/sandbox_defconfig
index afb4d939b855081cd1e4e6b8ff5f788196283f9d..2dbeaccb09e981c7b75c35a27084ff60d8313cbb 100644 (file)
--- 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 7cc9257a5bfd3e375a9947d8648ca0cf055f90b4..56b5e68769126160883c9b538d21e5eb966cd589 100644 (file)
--- 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 e0ee8c23fe225f12aeb68c4446a04a549321b550..eb70a5fbd18b710a96cdbaa45f1449baad493723 100644 (file)
--- 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 b2d21cec713751df5366453edad10d742a563a53..12fc9f3c73f1ddc6fe068d970ef756615c56871d 100644 (file)
--- 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 0b67bb7e6f65bacb5c54a70ea4e5a473159b00e1..e422a9704868e22c64ce01586a3c6318e9156c11 100644 (file)
--- 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 58e1522e6f4fe97225883bc5f0c502c0dad8f796..56af3c7a5a0118db844eae67752bfd9b427170a4 100644 (file)
--- 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