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>
This commit is contained in:
parent
2d0281c6c9
commit
7b0e0d9810
|
@ -82,7 +82,9 @@ static void __attribute__((noinline)) romstage(void)
|
||||||
/* FIXME: this may require coordination with moving timestamps */
|
/* FIXME: this may require coordination with moving timestamps */
|
||||||
cbmem_initialize_empty();
|
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();
|
run_ramstage();
|
||||||
}
|
}
|
||||||
|
|
|
@ -82,7 +82,9 @@ static void __attribute__((noinline)) romstage(void)
|
||||||
/* FIXME: this may require coordination with moving timestamps */
|
/* FIXME: this may require coordination with moving timestamps */
|
||||||
cbmem_initialize_empty();
|
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();
|
run_ramstage();
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,7 +86,9 @@ static void __attribute__((noinline)) romstage(void)
|
||||||
/* FIXME: this may require coordination with moving timestamps */
|
/* FIXME: this may require coordination with moving timestamps */
|
||||||
cbmem_initialize_empty();
|
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();
|
run_ramstage();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue