[coreboot-gerrit] Change in coreboot[master]: asus/p2b-*: Move serial init to mainboard bootblock

[Keith Hui (Code Review)]

Keith Hui has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38670 )

Change subject: asus/p2b-*: Move serial init to mainboard bootblock
......................................................................

asus/p2b-*: Move serial init to mainboard bootblock

Change-Id: I6f3ee68e7c76a8c6db6d75956e6a7fb75ef83850
Signed-off-by: Keith Hui 
---
M src/mainboard/asus/p2b/Makefile.inc
R src/mainboard/asus/p2b/early_init.c
M src/northbridge/intel/i440bx/romstage.c
3 files changed, 3 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/70/38670/1

diff --git a/src/mainboard/asus/p2b/Makefile.inc b/src/mainboard/asus/p2b/Makefile.inc
index 620b000..68cd7e7 100644
--- a/src/mainboard/asus/p2b/Makefile.inc
+++ b/src/mainboard/asus/p2b/Makefile.inc
@@ -1,4 +1,4 @@
-romstage-y += romstage.c
+bootblock-y += early_init.c

# If not building for the "main variant" of p2b, remove p2b's irq_tables.c from list
 # of files to compile, and replace with irq_tables.c for the variant only if
diff --git a/src/mainboard/asus/p2b/romstage.c b/src/mainboard/asus/p2b/early_init.c
similarity index 90%
rename from src/mainboard/asus/p2b/romstage.c
rename to src/mainboard/asus/p2b/early_init.c
index fbd7124..725e614 100644
--- a/src/mainboard/asus/p2b/romstage.c
+++ b/src/mainboard/asus/p2b/early_init.c
@@ -14,13 +14,13 @@
  * GNU General Public License for more details.
  */

-#include <northbridge/intel/i440bx/raminit.h>
+#include <bootblock_common.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83977tf/w83977tf.h>

#define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)

-void mainboard_enable_serial(void)
+void bootblock_mainboard_early_init(void)
 {
    winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
 }
diff --git a/src/northbridge/intel/i440bx/romstage.c b/src/northbridge/intel/i440bx/romstage.c
index 1dee03a..8109c37 100644
--- a/src/northbridge/intel/i440bx/romstage.c
+++ b/src/northbridge/intel/i440bx/romstage.c
@@ -20,9 +20,6 @@

void mainboard_romstage_entry(void)
 {
-	mainboard_enable_serial();
-	console_init();
-
    i82371eb_early_init();

sdram_initialize();