summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/sandbox_noinst_defconfig1
-rw-r--r--drivers/block/Kconfig2
-rw-r--r--fs/Makefile2
3 files changed, 3 insertions, 2 deletions
diff --git a/configs/sandbox_noinst_defconfig b/configs/sandbox_noinst_defconfig
index eb0f064ad28..4424eae79ef 100644
--- a/configs/sandbox_noinst_defconfig
+++ b/configs/sandbox_noinst_defconfig
@@ -187,6 +187,7 @@ CONFIG_P2SB=y
CONFIG_PWRSEQ=y
CONFIG_SPL_PWRSEQ=y
CONFIG_FS_LOADER=y
+CONFIG_SPL_FS_LOADER=y
CONFIG_MMC_SANDBOX=y
CONFIG_DM_MTD=y
CONFIG_MTD_CONCAT=y
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 48529a6982f..5283d8981e0 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -109,7 +109,7 @@ config EFI_MEDIA
config SPL_BLK_FS
bool "Load images from filesystems on block devices"
- depends on SPL_BLK
+ depends on SPL_BLK && SPL_FS_LOADER
help
Use generic support to load images from fat/ext filesystems on
different types of block devices such as NVMe.
diff --git a/fs/Makefile b/fs/Makefile
index 7b05c79e0cc..a3ee0a361d3 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -5,7 +5,7 @@
# Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved.
ifdef CONFIG_SPL_BUILD
-obj-$(CONFIG_FS_LOADER) += fs.o
+obj-$(CONFIG_SPL_FS_LOADER) += fs.o
obj-$(CONFIG_SPL_FS_FAT) += fat/
obj-$(CONFIG_SPL_FS_EXT4) += ext4/
obj-$(CONFIG_SPL_FS_CBFS) += cbfs/