SPL: Rework logic around SPL_BLK_FS (and SPL_NVME)

As exposed by "make randconfig", we have an issue around SPL_BLK_FS.
This is functionally a library type symbol that should be selected when
required and select what it needs. Have SPL_BLK_FS select SPL_FS_LOADER
and then SPL_NVME will now correctly select SPL_FS_LOADER via
SPL_BLK_FS.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 69b6ad773462f0a449fb6fe1a478cb75cfe8415e..d1a85f50209e5072f50cf857924a3b11fa990a8c 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1497,7 +1497,6 @@ config SPL_SATA_RAW_U_BOOT_SECTOR
 config SPL_NVME
        bool "NVM Express device support"
        depends on SPL_BLK
-       select FS_LOADER
        select SPL_BLK_FS
        help
          This option enables support for NVM Express devices.

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 461b5a9fc838c59b9ec24f0c551b93b582eca8fd..adf338ab00c3f467902d9570b1eb0d8c8a792ab3 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -106,8 +106,9 @@ config EFI_MEDIA
          For sandbox there is a test driver.
 
 config SPL_BLK_FS
-       bool "Load images from filesystems on block devices"
-       depends on SPL_BLK && SPL_FS_LOADER
+       bool
+       depends on SPL_BLK
+       select SPL_FS_LOADER
        help
          Use generic support to load images from fat/ext filesystems on
          different types of block devices such as NVMe.