Patrick Georgi (pgeorgi@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10729 -gerrit commit fd59869ea90d86782163ed9d8e37f8429cafc7c7 Author: Patrick Georgi <pgeorgi@chromium.org> Date: Tue Jun 30 14:32:15 2015 +0200 google/nyan: remove timestamp leftovers from upstreaming Initializing timestamps and writing the "start romstage" timestamp already happens earlier. One question to sort out is what to do about the migration into cbmem, but at least this compiles again. Change-Id: Ie8a0b7998c6c9da71f036857987f3c781385034f Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> --- src/mainboard/google/nyan/romstage.c | 4 +--- src/mainboard/google/nyan_big/romstage.c | 4 +--- src/mainboard/google/nyan_blaze/romstage.c | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/mainboard/google/nyan/romstage.c b/src/mainboard/google/nyan/romstage.c index b9be62b..0f8e947 100644 --- a/src/mainboard/google/nyan/romstage.c +++ b/src/mainboard/google/nyan/romstage.c @@ -83,11 +83,9 @@ static void __attribute__((noinline)) romstage(void) hard_reset(); } + /* FIXME: this may require coordination with moving timestamps */ cbmem_initialize_empty(); - timestamp_init(0); - timestamp_add(TS_START_ROMSTAGE, romstage_start_time); - early_mainboard_init(); run_ramstage(); diff --git a/src/mainboard/google/nyan_big/romstage.c b/src/mainboard/google/nyan_big/romstage.c index b9be62b..0f8e947 100644 --- a/src/mainboard/google/nyan_big/romstage.c +++ b/src/mainboard/google/nyan_big/romstage.c @@ -83,11 +83,9 @@ static void __attribute__((noinline)) romstage(void) hard_reset(); } + /* FIXME: this may require coordination with moving timestamps */ cbmem_initialize_empty(); - timestamp_init(0); - timestamp_add(TS_START_ROMSTAGE, romstage_start_time); - early_mainboard_init(); run_ramstage(); diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c index 7ee2c6c..d62e303 100644 --- a/src/mainboard/google/nyan_blaze/romstage.c +++ b/src/mainboard/google/nyan_blaze/romstage.c @@ -87,11 +87,9 @@ static void __attribute__((noinline)) romstage(void) hard_reset(); } + /* FIXME: this may require coordination with moving timestamps */ cbmem_initialize_empty(); - timestamp_init(0); - timestamp_add(TS_START_ROMSTAGE, romstage_start_time); - early_mainboard_init(); run_ramstage();