aboutsummaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorMartin Roth <gaumless@gmail.com>2022-06-22 21:11:59 -0600
committerMartin L Roth <gaumless@tutanota.com>2022-06-24 03:59:49 +0000
commitd51141e63007a3725e9ca0b8b5329a28a9669e03 (patch)
tree9b1ff85c29dff13cf66af4246908d4796879832e /src/soc
parent7e48686535f2abe9946cdeb92002e3edc452e34d (diff)
soc/intel: Move top_swap Kconfig symbols into soc/intel/common
Move the Intel top_swap feature into the intel/common Kconfig file. Signed-off-by: Martin Roth <gaumless@gmail.com> Change-Id: I3ed649aaeb51c2250be9473114c17d3f191d2c38 Reviewed-on: https://review.coreboot.org/c/coreboot/+/65328 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Elyes Haouas <ehaouas@noos.fr> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/Kconfig36
-rw-r--r--src/soc/intel/common/Kconfig.common38
2 files changed, 38 insertions, 36 deletions
diff --git a/src/soc/intel/Kconfig b/src/soc/intel/Kconfig
deleted file mode 100644
index c4ce3216e5..0000000000
--- a/src/soc/intel/Kconfig
+++ /dev/null
@@ -1,36 +0,0 @@
-# should all probably be moved to soc/intel/common/Kconfig
-
-config INTEL_HAS_TOP_SWAP
- bool
- help
- Set this config if the Intel SoC supports top swap feature
-
-config INTEL_ADD_TOP_SWAP_BOOTBLOCK
- bool "Include a Top swap bootblock"
- default n
- depends on INTEL_HAS_TOP_SWAP
- help
- Intel PCH/Southbridges have feature that it is possible to have
- the southbridge/PCH look for the bootblock at a 64K or
- 128K/256K/512K/1MB (in case of newer SoCs) offset
- instead of the usual top of flash.
- Select this to put a 'second' bootblock.
-
-config INTEL_TOP_SWAP_BOOTBLOCK_SIZE
- hex "Size of top swap boot block"
- depends on INTEL_ADD_TOP_SWAP_BOOTBLOCK
- default 0x10000
- help
- Set this config to a supported topswap size.
- Valid sizes: 0x10000 0x20000 0x40000 0x80000 0x100000
-
-config INTEL_TOP_SWAP_FIT_ENTRY_FMAP_REG
- string
- depends on INTEL_ADD_TOP_SWAP_BOOTBLOCK
- help
- Use this config to specify the name of a FMAP region (which should
- hold a microcode) whose address as the first entry in the topswap FIT.
- This is useful in creating a asymmetric FIT in top swap bootblock
- than the one in non-topswap bootblock. This string will be passed
- onto ifittool (-A -n option). ifittool will not parse the region for MCU
- entries, and only locate the region and insert its address into FIT.
diff --git a/src/soc/intel/common/Kconfig.common b/src/soc/intel/common/Kconfig.common
index c7e1aec4de..4b620a677f 100644
--- a/src/soc/intel/common/Kconfig.common
+++ b/src/soc/intel/common/Kconfig.common
@@ -1,3 +1,41 @@
+config INTEL_HAS_TOP_SWAP
+ bool
+ help
+ Set this config if the Intel SoC supports top swap feature
+
+if INTEL_HAS_TOP_SWAP
+
+config INTEL_ADD_TOP_SWAP_BOOTBLOCK
+ bool "Include a Top swap bootblock"
+ default n
+ help
+ Intel PCH/Southbridges have feature that it is possible to have
+ the southbridge/PCH look for the bootblock at a 64K or
+ 128K/256K/512K/1MB (in case of newer SoCs) offset
+ instead of the usual top of flash.
+ Select this to put a 'second' bootblock.
+
+config INTEL_TOP_SWAP_BOOTBLOCK_SIZE
+ hex "Size of top swap boot block"
+ depends on INTEL_ADD_TOP_SWAP_BOOTBLOCK
+ default 0x10000
+ help
+ Set this config to a supported topswap size.
+ Valid sizes: 0x10000 0x20000 0x40000 0x80000 0x100000
+
+config INTEL_TOP_SWAP_FIT_ENTRY_FMAP_REG
+ string
+ depends on INTEL_ADD_TOP_SWAP_BOOTBLOCK
+ help
+ Use this config to specify the name of a FMAP region (which should
+ hold a microcode) whose address as the first entry in the topswap FIT.
+ This is useful in creating a asymmetric FIT in top swap bootblock
+ than the one in non-topswap bootblock. This string will be passed
+ onto ifittool (-A -n option). ifittool will not parse the region for MCU
+ entries, and only locate the region and insert its address into FIT.
+
+endif
+
config SOC_INTEL_COMMON
bool
select AZALIA_PLUGIN_SUPPORT