summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2017-12-15 12:59:18 -0700
committerAaron Durbin <adurbin@chromium.org>2017-12-17 18:29:32 +0000
commit934f433d87df0440294be6fc2e6395e0139a5e34 (patch)
tree6500ad49610f6c409fce508f182564701efb5170
parent6760d2de300615ab24dd0560d908dc46f6fe30c7 (diff)
soc/intel/apollolake: move default y options to CPU_SPECIFIC_OPTIONS
A non-user configurable option that defaults to y should just be auto-selected instead of instantiating an instance of an option. BUG=b:69614064 Change-Id: I55cf28eaf0233182d4fa488cf4b31e8ad379b6c4 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/22907 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
-rw-r--r--src/soc/intel/apollolake/Kconfig10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 26a8a5554c..89b5835f3c 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -36,6 +36,7 @@ config CPU_SPECIFIC_OPTIONS
select SOC_INTEL_COMMON_NHLT
# Misc options
select C_ENVIRONMENT_BOOTBLOCK
+ select CACHE_MRC_SETTINGS
select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM if RELOCATABLE_RAMSTAGE
select COLLECT_TIMESTAMPS
select COMMON_FADT
@@ -44,6 +45,7 @@ config CPU_SPECIFIC_OPTIONS
select HAVE_INTEL_FIRMWARE
select HAVE_SMI_HANDLER
select MRC_SETTINGS_PROTECT
+ select MRC_SETTINGS_VARIABLE_DATA
select NO_FIXED_XIP_ROM_SIZE
select NO_XIP_EARLY_STAGES
select PARALLEL_MP
@@ -191,14 +193,6 @@ config VERSTAGE_ADDR
help
The base address (in CAR) where verstage should be linked
-config CACHE_MRC_SETTINGS
- bool
- default y
-
-config MRC_SETTINGS_VARIABLE_DATA
- bool
- default y
-
config FSP_M_ADDR
hex
default 0xfef40000