From 5d8ad8598bc5043bde2329aa5be561f6a1e308cd Mon Sep 17 00:00:00 2001 From: Keith Hui Date: Sun, 2 Feb 2020 00:26:59 -0500 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/38670 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/mainboard/asus/p2b/Makefile.inc | 2 ++ src/mainboard/asus/p2b/bootblock.c | 13 +++++++++++++ src/mainboard/asus/p2b/romstage.c | 25 ------------------------- 3 files changed, 15 insertions(+), 25 deletions(-) create mode 100644 src/mainboard/asus/p2b/bootblock.c delete mode 100644 src/mainboard/asus/p2b/romstage.c (limited to 'src/mainboard') 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 +#include +#include + +#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 -#include -#include - -#define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1) - -void mainboard_enable_serial(void) -{ - winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); -} -- cgit v1.2.3