[coreboot-gerrit] Patch set updated for coreboot: nyan: Avoid running early_mainboard_init twice in vboot context

[Paul Kocialkowski]

Paul Kocialkowski ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15450

-gerrit

commit 7d69fe0ed193c1de7dd9923b4aa075cef11e5241
Author: Paul Kocialkowski 
Date:   Mon Jun 27 18:17:14 2016 +0200

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 
---
 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, 9 insertions(+), 3 deletions(-)

diff --git a/src/mainboard/google/nyan/romstage.c b/src/mainboard/google/nyan/romstage.c
index d09bf5e..2388f95 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 d09bf5e..2388f95 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 373d43b..e91fa33 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();
 }