summaryrefslogtreecommitdiff
path: root/src/include
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/include
parentde1fe7f655c549e8dce5b34218221890fa5ccc34 (diff)
downloadcoreboot-cbf5bdfe67e90f780b9f5b2f8cb9cd6e0d46682d.tar.xz
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/include')
-rw-r--r--src/include/cpu/x86/car.h2
-rw-r--r--src/include/timestamp.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/include/cpu/x86/car.h b/src/include/cpu/x86/car.h
index 7b5cedf213..5fc11f9cbc 100644
--- a/src/include/cpu/x86/car.h
+++ b/src/include/cpu/x86/car.h
@@ -28,7 +28,7 @@
#define CAR_CBMEM
#endif
-#if CONFIG_CAR_MIGRATION && defined(__PRE_RAM__)
+#if defined(__PRE_RAM__)
#define CAR_MIGRATE_ATTR __attribute__ ((used,section (".car.migrate")))
/* Call migrate_fn_() when CAR globals are migrated. */
diff --git a/src/include/timestamp.h b/src/include/timestamp.h
index 0f56200782..edc0076c1c 100644
--- a/src/include/timestamp.h
+++ b/src/include/timestamp.h
@@ -59,13 +59,13 @@ enum timestamp_id {
void timestamp_init(tsc_t base);
void timestamp_add(enum timestamp_id id, tsc_t ts_time);
void timestamp_add_now(enum timestamp_id id);
-void timestamp_sync(void);
+void timestamp_reinit(void);
tsc_t get_initial_timestamp(void);
#else
#define timestamp_init(base)
#define timestamp_add(id, time)
#define timestamp_add_now(id)
-#define timestamp_sync()
+#define timestamp_reinit()
#endif
#endif