summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2013-09-10 00:07:21 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2013-09-21 06:34:55 +0200
commitcbf5bdfe67e90f780b9f5b2f8cb9cd6e0d46682d (patch)
tree158bc3b636a9024843c2e88d5f487792d17736ff /src/cpu
parentde1fe7f655c549e8dce5b34218221890fa5ccc34 (diff)
CBMEM: Always select CAR_MIGRATION
If romstage does not make cbmem_initialize() call, linker should optimize the code for CAR migration away. This simplifies design of CBMEM console by a considerable amount. As console buffer is now migrated within cbmem_initialize() call there is no longer need for cbmemc_reinit() call made at end of romstage. Change-Id: I8675ecaafb641fa02675e9ba3f374caa8e240f1d Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/3916 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/intel/haswell/Kconfig1
-rw-r--r--src/cpu/intel/haswell/romstage.c1
-rw-r--r--src/cpu/x86/Kconfig9
-rw-r--r--src/cpu/x86/Makefile.inc2
4 files changed, 1 insertions, 12 deletions
diff --git a/src/cpu/intel/haswell/Kconfig b/src/cpu/intel/haswell/Kconfig
index c352e36868..7b6fc43257 100644
--- a/src/cpu/intel/haswell/Kconfig
+++ b/src/cpu/intel/haswell/Kconfig
@@ -18,7 +18,6 @@ config CPU_SPECIFIC_OPTIONS
#select AP_IN_SIPI_WAIT
select TSC_SYNC_MFENCE
select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
- select CAR_MIGRATION
config BOOTBLOCK_CPU_INIT
string
diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c
index e62b894bb9..757cc34eeb 100644
--- a/src/cpu/intel/haswell/romstage.c
+++ b/src/cpu/intel/haswell/romstage.c
@@ -278,7 +278,6 @@ void romstage_common(const struct romstage_params *params)
#if CONFIG_CHROMEOS
init_chromeos(boot_mode);
#endif
- timestamp_sync();
timestamp_add_now(TS_END_ROMSTAGE);
}
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index c10dd1579f..c64a8e477b 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -115,12 +115,3 @@ config X86_AMD_FIXED_MTRRS
help
This option informs the MTRR code to use the RdMem and WrMem fields
in the fixed MTRR MSRs.
-
-config CAR_MIGRATION
- def_bool n
- depends on DYNAMIC_CBMEM || EARLY_CBMEM_INIT
- help
- Migrate the cache-as-ram variables to CBMEM once CBMEM is set up
- in romstage. This option is only needed if one will be doing more
- work in romstage after the cache-as-ram is torn down aside from
- loading ramstage.
diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc
index fe8648cc49..311dcc1d1f 100644
--- a/src/cpu/x86/Makefile.inc
+++ b/src/cpu/x86/Makefile.inc
@@ -1 +1 @@
-romstage-$(CONFIG_CAR_MIGRATION) += car.c
+romstage-$(CONFIG_CACHE_AS_RAM) += car.c