diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2016-06-27 18:17:14 +0200 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-07-07 17:11:10 +0200 |
| commit | 7b0e0d98101a49b1e53567ff1bfa3d6a3bda6cf5 (patch) | |
| tree | 7b334f4a09e0730b4ba86d22789f8469c645a84c /src | |
| parent | 2d0281c6c9303a8d375de1f710f0282e9b8a1617 (diff) | |
| download | coreboot-7b0e0d98101a49b1e53567ff1bfa3d6a3bda6cf5.tar.xz | |
nyan: Avoid running early_mainboard_init twice in vboot context
A call to early_mainboard_init is already present in verstage, thus it
is only necessary to call it from romstage when not in vboot context.
Change-Id: I2e0b5a369c5fb24efae4ac40d83a31f5cf4a078d
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Reviewed-on: https://review.coreboot.org/15450
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src')
| -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(); } |