diff options
| -rw-r--r-- | src/drivers/intel/fsp1_1/romstage.c | 2 | ||||
| -rw-r--r-- | src/drivers/intel/fsp2_0/memory_init.c | 2 | ||||
| -rw-r--r-- | src/drivers/mrc_cache/Kconfig | 31 | ||||
| -rw-r--r-- | src/drivers/mrc_cache/Makefile.inc | 16 | ||||
| -rw-r--r-- | src/drivers/mrc_cache/mrc_cache.c (renamed from src/soc/intel/common/mrc_cache.c) | 0 | ||||
| -rw-r--r-- | src/include/mrc_cache.h (renamed from src/soc/intel/common/mrc_cache.h) | 0 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/romstage.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/baytrail/romstage/raminit.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/braswell/romstage/romstage.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/broadwell/romstage/raminit.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/common/Kconfig | 32 | ||||
| -rw-r--r-- | src/soc/intel/common/Makefile.inc | 15 |
12 files changed, 53 insertions, 53 deletions
diff --git a/src/drivers/intel/fsp1_1/romstage.c b/src/drivers/intel/fsp1_1/romstage.c index e6dec251be..81939c4c33 100644 --- a/src/drivers/intel/fsp1_1/romstage.c +++ b/src/drivers/intel/fsp1_1/romstage.c @@ -28,11 +28,11 @@ #include <ec/google/chromeec/ec_commands.h> #include <elog.h> #include <fsp/romstage.h> +#include <mrc_cache.h> #include <reset.h> #include <program_loading.h> #include <romstage_handoff.h> #include <smbios.h> -#include <soc/intel/common/mrc_cache.h> #include <stage_cache.h> #include <string.h> #include <timestamp.h> diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c index 0aea1ad76d..039dafec8e 100644 --- a/src/drivers/intel/fsp2_0/memory_init.c +++ b/src/drivers/intel/fsp2_0/memory_init.c @@ -24,10 +24,10 @@ #include <fsp/api.h> #include <fsp/util.h> #include <memrange.h> +#include <mrc_cache.h> #include <program_loading.h> #include <reset.h> #include <romstage_handoff.h> -#include <soc/intel/common/mrc_cache.h> #include <string.h> #include <symbols.h> #include <timestamp.h> diff --git a/src/drivers/mrc_cache/Kconfig b/src/drivers/mrc_cache/Kconfig new file mode 100644 index 0000000000..3e0bdda2be --- /dev/null +++ b/src/drivers/mrc_cache/Kconfig @@ -0,0 +1,31 @@ +config CACHE_MRC_SETTINGS + bool "Save cached MRC settings" + default n + +if CACHE_MRC_SETTINGS + +config MRC_SETTINGS_CACHE_BASE + hex + default 0xfffe0000 + +config MRC_SETTINGS_CACHE_SIZE + hex + default 0x10000 + +config MRC_SETTINGS_PROTECT + bool "Enable protection on MRC settings" + default n + +config HAS_RECOVERY_MRC_CACHE + bool + default n + +config MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN + bool + default n + +config MRC_SETTINGS_VARIABLE_DATA + bool + default n + +endif # CACHE_MRC_SETTINGS diff --git a/src/drivers/mrc_cache/Makefile.inc b/src/drivers/mrc_cache/Makefile.inc new file mode 100644 index 0000000000..819d637e4f --- /dev/null +++ b/src/drivers/mrc_cache/Makefile.inc @@ -0,0 +1,16 @@ + +romstage-$(CONFIG_CACHE_MRC_SETTINGS) += mrc_cache.c +ramstage-$(CONFIG_CACHE_MRC_SETTINGS) += mrc_cache.c + +# Create and add the MRC cache to the cbfs image +ifneq ($(CONFIG_CHROMEOS),y) +$(obj)/mrc.cache: $(obj)/config.h + dd if=/dev/zero count=1 \ + bs=$(shell printf "%d" $(CONFIG_MRC_SETTINGS_CACHE_SIZE) ) | \ + tr '\000' '\377' > $@ + +cbfs-files-$(CONFIG_CACHE_MRC_SETTINGS) += mrc.cache +mrc.cache-file := $(obj)/mrc.cache +mrc.cache-position := $(CONFIG_MRC_SETTINGS_CACHE_BASE) +mrc.cache-type := mrc_cache +endif diff --git a/src/soc/intel/common/mrc_cache.c b/src/drivers/mrc_cache/mrc_cache.c index 3a9689645f..3a9689645f 100644 --- a/src/soc/intel/common/mrc_cache.c +++ b/src/drivers/mrc_cache/mrc_cache.c diff --git a/src/soc/intel/common/mrc_cache.h b/src/include/mrc_cache.h index 4511fc3016..4511fc3016 100644 --- a/src/soc/intel/common/mrc_cache.h +++ b/src/include/mrc_cache.h diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c index a003ea0e0e..20b67fd471 100644 --- a/src/soc/intel/apollolake/romstage.c +++ b/src/soc/intel/apollolake/romstage.c @@ -36,9 +36,9 @@ #include <intelblocks/smm.h> #include <intelblocks/systemagent.h> #include <intelblocks/pmclib.h> +#include <mrc_cache.h> #include <reset.h> #include <soc/cpu.h> -#include <soc/intel/common/mrc_cache.h> #include <soc/iomap.h> #include <soc/systemagent.h> #include <soc/pci_devs.h> diff --git a/src/soc/intel/baytrail/romstage/raminit.c b/src/soc/intel/baytrail/romstage/raminit.c index b577a35ece..45bc75b9b3 100644 --- a/src/soc/intel/baytrail/romstage/raminit.c +++ b/src/soc/intel/baytrail/romstage/raminit.c @@ -21,8 +21,8 @@ #include <console/console.h> #include <device/pci_def.h> #include <halt.h> +#include <mrc_cache.h> #include <soc/gpio.h> -#include <soc/intel/common/mrc_cache.h> #include <soc/iomap.h> #include <soc/iosf.h> #include <soc/pci_devs.h> diff --git a/src/soc/intel/braswell/romstage/romstage.c b/src/soc/intel/braswell/romstage/romstage.c index 01258476d4..0f82c49999 100644 --- a/src/soc/intel/braswell/romstage/romstage.c +++ b/src/soc/intel/braswell/romstage/romstage.c @@ -28,13 +28,13 @@ #include <device/device.h> #include <device/pci_def.h> #include <elog.h> +#include <mrc_cache.h> #include <romstage_handoff.h> #include <string.h> #include <timestamp.h> #include <reset.h> #include <vendorcode/google/chromeos/chromeos.h> #include <fsp/util.h> -#include <soc/intel/common/mrc_cache.h> #include <soc/gpio.h> #include <soc/iomap.h> #include <soc/iosf.h> diff --git a/src/soc/intel/broadwell/romstage/raminit.c b/src/soc/intel/broadwell/romstage/raminit.c index 0470beec7e..665dad277e 100644 --- a/src/soc/intel/broadwell/romstage/raminit.c +++ b/src/soc/intel/broadwell/romstage/raminit.c @@ -21,13 +21,13 @@ #include <console/console.h> #include <device/pci_def.h> #include <lib.h> +#include <mrc_cache.h> #include <string.h> #if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC) #include <ec/google/chromeec/ec.h> #include <ec/google/chromeec/ec_commands.h> #endif #include <vendorcode/google/chromeos/chromeos.h> -#include <soc/intel/common/mrc_cache.h> #include <soc/iomap.h> #include <soc/pei_data.h> #include <soc/pei_wrapper.h> diff --git a/src/soc/intel/common/Kconfig b/src/soc/intel/common/Kconfig index 18a34b335c..95c09c78c4 100644 --- a/src/soc/intel/common/Kconfig +++ b/src/soc/intel/common/Kconfig @@ -8,38 +8,6 @@ if SOC_INTEL_COMMON comment "Intel SoC Common Code" source "src/soc/intel/common/block/Kconfig" -config CACHE_MRC_SETTINGS - bool "Save cached MRC settings" - default n - -if CACHE_MRC_SETTINGS - -config MRC_SETTINGS_CACHE_BASE - hex - default 0xfffe0000 - -config MRC_SETTINGS_CACHE_SIZE - hex - default 0x10000 - -config MRC_SETTINGS_PROTECT - bool "Enable protection on MRC settings" - default n - -config HAS_RECOVERY_MRC_CACHE - bool - default n - -config MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN - bool - default n - -config MRC_SETTINGS_VARIABLE_DATA - bool - default n - -endif # CACHE_MRC_SETTINGS - config DISPLAY_MTRRS bool "MTRRs: Display the MTRR settings" default n diff --git a/src/soc/intel/common/Makefile.inc b/src/soc/intel/common/Makefile.inc index c913cfd195..e56ac7daaf 100644 --- a/src/soc/intel/common/Makefile.inc +++ b/src/soc/intel/common/Makefile.inc @@ -9,7 +9,6 @@ verstage-$(CONFIG_SOC_INTEL_COMMON_RESET) += reset.c bootblock-$(CONFIG_SOC_INTEL_COMMON_RESET) += reset.c -romstage-$(CONFIG_CACHE_MRC_SETTINGS) += mrc_cache.c romstage-$(CONFIG_SOC_INTEL_COMMON_RESET) += reset.c romstage-y += util.c romstage-$(CONFIG_MMA) += mma.c @@ -19,7 +18,6 @@ postcar-y += util.c postcar-$(CONFIG_SOC_INTEL_COMMON_RESET) += reset.c ramstage-y += hda_verb.c -ramstage-$(CONFIG_CACHE_MRC_SETTINGS) += mrc_cache.c ramstage-$(CONFIG_SOC_INTEL_COMMON_RESET) += reset.c ramstage-y += util.c ramstage-$(CONFIG_MMA) += mma.c @@ -33,19 +31,6 @@ verstage-$(CONFIG_MAINBOARD_HAS_TPM_CR50) += tpm_tis.c romstage-$(CONFIG_MAINBOARD_HAS_TPM_CR50) += tpm_tis.c ramstage-$(CONFIG_MAINBOARD_HAS_TPM_CR50) += tpm_tis.c -# Create and add the MRC cache to the cbfs image -ifneq ($(CONFIG_CHROMEOS),y) -$(obj)/mrc.cache: $(obj)/config.h - dd if=/dev/zero count=1 \ - bs=$(shell printf "%d" $(CONFIG_MRC_SETTINGS_CACHE_SIZE) ) | \ - tr '\000' '\377' > $@ - -cbfs-files-$(CONFIG_CACHE_MRC_SETTINGS) += mrc.cache -mrc.cache-file := $(obj)/mrc.cache -mrc.cache-position := $(CONFIG_MRC_SETTINGS_CACHE_BASE) -mrc.cache-type := mrc_cache -endif - ifeq ($(CONFIG_MMA),y) MMA_BLOBS_PATH = $(call strip_quotes,$(CONFIG_MMA_BLOBS_PATH)) MMA_TEST_NAMES = $(notdir $(wildcard $(MMA_BLOBS_PATH)/tests/*)) |