summaryrefslogtreecommitdiff
path: root/src/soc/intel/common
diff options
context:
space:
mode:
authorRaul E Rangel <rrangel@chromium.org>2021-06-24 16:54:27 -0600
committerRaul Rangel <rrangel@chromium.org>2021-07-02 23:11:16 +0000
commite92a9825587ac1c4c6133603354f711344e742dd (patch)
tree43c170c52db27e53fc04e425d88e8aef763922bf /src/soc/intel/common
parente19d0efb5e4f9d3a9c0053df8b86c31da3d47ae7 (diff)
arch/x86: Add X86_CUSTOM_BOOTMEDIA
In order to disable X86_TOP4G_BOOTMEDIA_MAP it requires the definition to be overridden. This makes it a little less ergonomic to use. Instead introduce the inverse option that can be selected. I chose to leave X86_TOP4G_BOOTMEDIA_MAP since it keeps the Makefiles simple. BUG=b:179699789 TEST=none Signed-off-by: Raul E Rangel <rrangel@chromium.org> Change-Id: I65bbc118bde88687a7d7749c87acf1cbdc56a269 Reviewed-on: https://review.coreboot.org/c/coreboot/+/55853 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/soc/intel/common')
-rw-r--r--src/soc/intel/common/block/fast_spi/Kconfig15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/soc/intel/common/block/fast_spi/Kconfig b/src/soc/intel/common/block/fast_spi/Kconfig
index eb2373ca8b..9257bde0f5 100644
--- a/src/soc/intel/common/block/fast_spi/Kconfig
+++ b/src/soc/intel/common/block/fast_spi/Kconfig
@@ -15,6 +15,10 @@ config FAST_SPI_DISABLE_WRITE_STATUS
config FAST_SPI_SUPPORTS_EXT_BIOS_WINDOW
bool
depends on SOC_INTEL_COMMON_BLOCK_FAST_SPI
+ # Enable X86_CUSTOM_BOOTMEDIA because the fast SPI controller
+ # driver provides a custom boot media device when multiple decode
+ # windows are used for the BIOS region.
+ select X86_CUSTOM_BOOTMEDIA
help
Fast SPI controller on the platform supports additional
window for memory mapping BIOS region (region 1) on the SPI
@@ -45,14 +49,3 @@ config EXT_BIOS_WIN_SIZE
Maximum size of the extended window reserved for mapping BIOS
region greater than 16MiB. The actual mapped window might be
smaller depending upon the size of the BIOS region.
-
-if FAST_SPI_SUPPORTS_EXT_BIOS_WINDOW
-
-# Disable X86_TOP4G_BOOTMEDIA_MAP because the fast SPI controller
-# driver provides a custom boot media device when multiple decode
-# windows are used for the BIOS region.
-
-config X86_TOP4G_BOOTMEDIA_MAP
- default n
-
-endif