From 934f433d87df0440294be6fc2e6395e0139a5e34 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Fri, 15 Dec 2017 12:59:18 -0700 Subject: 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 Reviewed-on: https://review.coreboot.org/22907 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/soc/intel/apollolake/Kconfig | 10 ++-------- 1 file 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 -- cgit v1.2.3