diff options
| -rw-r--r-- | src/mainboard/google/nyan/romstage.c | 4 | ||||
| -rw-r--r-- | src/mainboard/google/nyan_big/romstage.c | 4 | ||||
| -rw-r--r-- | src/mainboard/google/nyan_blaze/romstage.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/mainboard/google/nyan/romstage.c b/src/mainboard/google/nyan/romstage.c index d09bf5e5ae..2388f95aee 100644 --- a/src/mainboard/google/nyan/romstage.c +++ b/src/mainboard/google/nyan/romstage.c @@ -82,7 +82,9 @@ static void __attribute__((noinline)) romstage(void) /* FIXME: this may require coordination with moving timestamps */ cbmem_initialize_empty(); - early_mainboard_init(); + /* This was already called from verstage in vboot context. */ + if (!IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE)) + early_mainboard_init(); run_ramstage(); } diff --git a/src/mainboard/google/nyan_big/romstage.c b/src/mainboard/google/nyan_big/romstage.c index d09bf5e5ae..2388f95aee 100644 --- a/src/mainboard/google/nyan_big/romstage.c +++ b/src/mainboard/google/nyan_big/romstage.c @@ -82,7 +82,9 @@ static void __attribute__((noinline)) romstage(void) /* FIXME: this may require coordination with moving timestamps */ cbmem_initialize_empty(); - early_mainboard_init(); + /* This was already called from verstage in vboot context. */ + if (!IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE)) + early_mainboard_init(); run_ramstage(); } diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c index 373d43bceb..e91fa3379e 100644 --- a/src/mainboard/google/nyan_blaze/romstage.c +++ b/src/mainboard/google/nyan_blaze/romstage.c @@ -86,7 +86,9 @@ static void __attribute__((noinline)) romstage(void) /* FIXME: this may require coordination with moving timestamps */ cbmem_initialize_empty(); - early_mainboard_init(); + /* This was already called from verstage in vboot context. */ + if (!IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE)) + early_mainboard_init(); run_ramstage(); } |