From 5d8ad8598bc5043bde2329aa5be561f6a1e308cd Mon Sep 17 00:00:00 2001
From: Keith Hui <buurin@gmail.com>
Date: Sun, 2 Feb 2020 00:26:59 -0500
Subject: [PATCH] asus/p2b*: Move serial init into mainboard bootblock

With this bootblock messages are transmitted over serial too.

TEST=Serial messages transmitted normally on asus/p2b-ls.

Change-Id: I6f3ee68e7c76a8c6db6d75956e6a7fb75ef83850
Signed-off-by: Keith Hui <buurin@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38670
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
 src/mainboard/asus/p2b/Makefile.inc     |  2 ++
 src/mainboard/asus/p2b/bootblock.c      | 13 +++++++++++++
 src/mainboard/asus/p2b/romstage.c       | 25 -------------------------
 src/northbridge/intel/i440bx/romstage.c |  4 ----
 4 files changed, 15 insertions(+), 29 deletions(-)
 create mode 100644 src/mainboard/asus/p2b/bootblock.c
 delete mode 100644 src/mainboard/asus/p2b/romstage.c

diff --git a/src/mainboard/asus/p2b/Makefile.inc b/src/mainboard/asus/p2b/Makefile.inc
index ca08106480..cc55c25a20 100644
--- a/src/mainboard/asus/p2b/Makefile.inc
+++ b/src/mainboard/asus/p2b/Makefile.inc
@@ -1,2 +1,4 @@
+bootblock-y += bootblock.c
+
 ramstage-$(CONFIG_GENERATE_PIRQ_TABLE) += variants/$(VARIANT_DIR)/irq_tables.c
 ramstage-$(CONFIG_GENERATE_MP_TABLE) += variants/$(VARIANT_DIR)/mptable.c
diff --git a/src/mainboard/asus/p2b/bootblock.c b/src/mainboard/asus/p2b/bootblock.c
new file mode 100644
index 0000000000..18eff07355
--- /dev/null
+++ b/src/mainboard/asus/p2b/bootblock.c
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* This file is part of the coreboot project. */
+
+#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 bootblock_mainboard_early_init(void)
+{
+	winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
+}
diff --git a/src/mainboard/asus/p2b/romstage.c b/src/mainboard/asus/p2b/romstage.c
deleted file mode 100644
index 67ba632ece..0000000000
--- a/src/mainboard/asus/p2b/romstage.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <northbridge/intel/i440bx/raminit.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)
-{
-	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 1dee03a984..bdcfdc9b85 100644
--- a/src/northbridge/intel/i440bx/romstage.c
+++ b/src/northbridge/intel/i440bx/romstage.c
@@ -14,15 +14,11 @@
 
 #include <arch/romstage.h>
 #include <cbmem.h>
-#include <console/console.h>
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 
 void mainboard_romstage_entry(void)
 {
-	mainboard_enable_serial();
-	console_init();
-
 	i82371eb_early_init();
 
 	sdram_initialize();