spl: env: Correct dependencies for SPL_SAVEENV and MMC

The SPL_SAVEENV functionality, when working with an MMC device, can only
work with SPL_MMC_WRITE enabled. This however only works with SPL_MMC
also being enabled. Update the dependencies to show that if we have
enabled SPL_ENV_IS_IN_MMC then we select SPL_MMC_WRITE and make
SPL_ENV_IS_IN_MMC depends on SPL_MMC.

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

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index d1a85f50209e5072f50cf857924a3b11fa990a8c..57b2bef5e541df75f1763ec7e8ebf8b8e14b9d8b 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -729,7 +729,7 @@ config SPL_ENV_SUPPORT
 config SPL_SAVEENV
        bool "Support save environment"
        depends on SPL_ENV_SUPPORT
-       select SPL_MMC_WRITE if ENV_IS_IN_MMC
+       select SPL_MMC_WRITE if SPL_ENV_IS_IN_MMC
        help
          Enable save environment support in SPL after setenv. By default
          the saveenv option is not provided in SPL, but some boards need

diff --git a/env/Kconfig b/env/Kconfig
index 5979f7faa9961d4420adef23f6efc152ea57f987..532adf884da83799b7713f98c5743d07f505c39f 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -847,6 +847,7 @@ config SPL_ENV_IS_IN_MMC
        bool "SPL Environment in an MMC device"
        depends on !SPL_ENV_IS_NOWHERE
        depends on !SPL_OS_BOOT_SECURE
+       depends on SPL_MMC
        depends on ENV_IS_IN_MMC
        default y
        help