diff --git a/arch/x86/cpu/coreboot/Kconfig b/arch/x86/cpu/coreboot/Kconfig
index 0a4a82ad13fe0e98fdd64bbc0a1335d9a21ba93e..982065193157dc02a204811821deb680b1ded1eb 100644
--- a/arch/x86/cpu/coreboot/Kconfig
+++ b/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
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 8a16ed77a89902fcb6620a8e363cbbcfe6b2771e..7a124415ed25a4a67aea7f1fd7d5f4088d7c5eb0 100644
--- a/cmd/Kconfig
+++ b/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
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 2dbeaccb09e981c7b75c35a27084ff60d8313cbb..8d51c49346e2b3158833ba896c7fb3566335b13b 100644
--- a/configs/sandbox_defconfig
+++ b/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
diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig
index 56b5e68769126160883c9b538d21e5eb966cd589..8669c6cb9a1209f3fb69951ba683ea3c0ef80f55 100644
--- a/configs/sandbox_noblk_defconfig
+++ b/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
diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index eb70a5fbd18b710a96cdbaa45f1449baad493723..f22ed39fe0af4939cf36f8a6d04263ab9d3e4c58 100644
--- a/configs/sandbox_spl_defconfig
+++ b/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
diff --git a/fs/Kconfig b/fs/Kconfig
index 41bb0b9f3a47619eb66ffd5a7ea744d403acf40d..e6438ad0ea3958216461ba98f9d38b09cc57a2bc 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -4,6 +4,8 @@
 
 menu "File systems"
 
+source "fs/cbfs/Kconfig"
+
 source "fs/ext4/Kconfig"
 
 source "fs/reiserfs/Kconfig"
diff --git a/fs/Makefile b/fs/Makefile
index 51d06fccb61ecbe0ad853e021f060fd1b4fdecd4..5c90656ba1db1d373865d952d4ade386eab47c77 100644
--- a/fs/Makefile
+++ b/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/
diff --git a/fs/cbfs/Kconfig b/fs/cbfs/Kconfig
new file mode 100644
index 0000000000000000000000000000000000000000..16089547a51c5dd49565ebda28622a693a33cb1b
--- /dev/null
+++ b/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.