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>

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