[coreboot-gerrit] New patch to review for coreboot: nyan: Call early_mainboard_init before cbmem init in romstage

Paul Kocialkowski (contact@paulk.fr) gerrit at coreboot.org
Mon Jun 27 21:36:24 CEST 2016


Paul Kocialkowski (contact at paulk.fr) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15450

-gerrit

commit ccc03fb081e3b7ad587f822d817fac04e464e820
Author: Paul Kocialkowski <contact at paulk.fr>
Date:   Mon Jun 27 18:17:14 2016 +0200

    nyan: Call early_mainboard_init before cbmem init in romstage
    
    cbmem init will eventually trigger init hooks, including
    vb2_fill_handoff_cbmem when verified boot is enabled, which fills the
    vboot handoff structure and calls vboot_wants_oprom that uses vbnv.
    
    When vbnv is obtained from the EC (that's the case on nyan), the EC SPI
    bus has to be properly configured or register access will hang.
    
    Such configuration is performed in early_mainboard_init, thus it has to
    be called before cbmem_initialize_empty.
    
    Change-Id: I2e0b5a369c5fb24efae4ac40d83a31f5cf4a078d
    Signed-off-by: Paul Kocialkowski <contact at paulk.fr>
---
 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, 6 insertions(+), 6 deletions(-)

diff --git a/src/mainboard/google/nyan/romstage.c b/src/mainboard/google/nyan/romstage.c
index d09bf5e..6f98bd7 100644
--- a/src/mainboard/google/nyan/romstage.c
+++ b/src/mainboard/google/nyan/romstage.c
@@ -79,11 +79,11 @@ static void __attribute__((noinline)) romstage(void)
 		hard_reset();
 	}
 
+	early_mainboard_init();
+
 	/* FIXME: this may require coordination with moving timestamps */
 	cbmem_initialize_empty();
 
-	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..6f98bd7 100644
--- a/src/mainboard/google/nyan_big/romstage.c
+++ b/src/mainboard/google/nyan_big/romstage.c
@@ -79,11 +79,11 @@ static void __attribute__((noinline)) romstage(void)
 		hard_reset();
 	}
 
+	early_mainboard_init();
+
 	/* FIXME: this may require coordination with moving timestamps */
 	cbmem_initialize_empty();
 
-	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..4899a54 100644
--- a/src/mainboard/google/nyan_blaze/romstage.c
+++ b/src/mainboard/google/nyan_blaze/romstage.c
@@ -83,11 +83,11 @@ static void __attribute__((noinline)) romstage(void)
 		hard_reset();
 	}
 
+	early_mainboard_init();
+
 	/* FIXME: this may require coordination with moving timestamps */
 	cbmem_initialize_empty();
 
-	early_mainboard_init();
-
 	run_ramstage();
 }
 



More information about the coreboot-gerrit mailing list