UPSTREAM: 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.

BUG=None
BRANCH=None
TEST=None

Change-Id: I2e0b5a369c5fb24efae4ac40d83a31f5cf4a078d
Original-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Original-Reviewed-on: https://review.coreboot.org/15450
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Martin Roth <martinroth@google.com>
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/358837
Reviewed-by: Furquan Shaikh <furquan@chromium.org>

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();
 }

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();
 }

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();
 }