env: x86: braswell: Set ENV_IS_IN_SPI_FLASH as default

Imply does not work for a Kconfig choice. Update ENV_IS_IN_SPI_FLASH
to be the default one for Intel Braswell.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/cpu/braswell/Kconfig b/arch/x86/cpu/braswell/Kconfig
index 0e214a7432c77ba60737be49f3638d88bf6a335f..616f22878831870bd14cbbb4337fc7fc7f6ac4bd 100644 (file)
--- a/arch/x86/cpu/braswell/Kconfig
+++ b/arch/x86/cpu/braswell/Kconfig
@@ -12,7 +12,6 @@ config INTEL_BRASWELL
        imply HAVE_INTEL_ME
        imply HAVE_VBT
        imply ENABLE_MRC_CACHE
-       imply ENV_IS_IN_SPI_FLASH
        imply AHCI_PCI
        imply ICH_SPI
        imply MMC

diff --git a/env/Kconfig b/env/Kconfig
index 02cb7cbb751dbc6d0a61439bac02bb297d9d67af..8c9d800f485fe120cdc899d79087ec273bbc63d6 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -16,6 +16,7 @@ choice
        default ENV_IS_IN_FLASH if SH && !CPU_SH4
        default ENV_IS_IN_SPI_FLASH if ARMADA_XP
        default ENV_IS_IN_SPI_FLASH if INTEL_BAYTRAIL
+       default ENV_IS_IN_SPI_FLASH if INTEL_BRASWELL
        default ENV_IS_IN_SPI_FLASH if INTEL_BROADWELL
        default ENV_IS_IN_SPI_FLASH if NORTHBRIDGE_INTEL_IVYBRIDGE
        default ENV_IS_IN_SPI_FLASH if INTEL_QUARK