fs: Kconfig: Add a separate config for FS_CBFS

Rather than using CMD_CBFS for both the filesystem and its command, we
should have a separate option for each. This allows us to enable CBFS
support without the command, if desired, which reduces U-Boot's size
slightly.

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: imply FS_CBFS on SYS_COREBOOT]
Signed-off-by: Tom Rini <trini@konsulko.com>

arch/x86/cpu/coreboot/Kconfig

@@ -4,6 +4,7 @@ config SYS_COREBOOT
 	bool
 	default y
 	imply CMD_CBFS
+	imply FS_CBFS
 
 config CBMEM_CONSOLE
 	bool

cmd/Kconfig

@@ -882,6 +882,7 @@ endmenu
 menu "Filesystem commands"
 config CMD_CBFS
 	bool "Enable the 'cbfs' command"
+	depends on FS_CBFS
 	help
 	  Define this to enable support for reading from a Coreboot
 	  filesystem. This is a ROM-based filesystem used for accessing files

configs/sandbox_defconfig

@@ -167,6 +167,7 @@ CONFIG_CONSOLE_ROTATION=y
 CONFIG_CONSOLE_TRUETYPE=y
 CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y
 CONFIG_VIDEO_SANDBOX_SDL=y
+CONFIG_FS_CBFS=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_TPM=y
 CONFIG_LZ4=y

configs/sandbox_noblk_defconfig

@@ -169,6 +169,7 @@ CONFIG_CONSOLE_ROTATION=y
 CONFIG_CONSOLE_TRUETYPE=y
 CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y
 CONFIG_VIDEO_SANDBOX_SDL=y
+CONFIG_FS_CBFS=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_TPM=y
 CONFIG_LZ4=y

configs/sandbox_spl_defconfig

@@ -173,6 +173,7 @@ CONFIG_CONSOLE_ROTATION=y
 CONFIG_CONSOLE_TRUETYPE=y
 CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y
 CONFIG_VIDEO_SANDBOX_SDL=y
+CONFIG_FS_CBFS=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_TPM=y
 CONFIG_LZ4=y

fs/Kconfig

@@ -4,6 +4,8 @@
 
 menu "File systems"
 
+source "fs/cbfs/Kconfig"
+
 source "fs/ext4/Kconfig"
 
 source "fs/reiserfs/Kconfig"

fs/Makefile

@@ -12,7 +12,7 @@ obj-$(CONFIG_SPL_EXT_SUPPORT) += ext4/
 else
 obj-y				+= fs.o
 
-obj-$(CONFIG_CMD_CBFS) += cbfs/
+obj-$(CONFIG_FS_CBFS) += cbfs/
 obj-$(CONFIG_CMD_CRAMFS) += cramfs/
 obj-$(CONFIG_FS_EXT4) += ext4/
 obj-y += fat/

fs/cbfs/Kconfig

@@ -0,0 +1,8 @@
+config FS_CBFS
+	bool "Enable CBFS (Coreboot Filesystem)"
+	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. You can also enable
+	  CMD_CBFS to get command-line access.