From 3a856473fdb05f8c20686f6240781ecb2c0c1b61 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Wed, 18 Oct 2017 18:20:54 -0700 Subject: [PATCH] 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 Reviewed-by: Simon Glass --- arch/x86/cpu/braswell/Kconfig | 1 - env/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/cpu/braswell/Kconfig b/arch/x86/cpu/braswell/Kconfig index 0e214a7432..616f228788 100644 --- 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 02cb7cbb75..8c9d800f48 100644 --- 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 -- 2.30.2