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

[Patrick Rudolph (Code Review)]

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38670 )

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

Patch Set 2: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38670 )

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

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/38670/2/src/northbridge/intel/i440b... 
File src/northbridge/intel/i440bx/romstage.c:

https://review.coreboot.org/c/coreboot/+/38670/2/src/northbridge/intel/i440b... 
PS2, Line 24: console_init
Where did this call go?

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38670 )

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

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/38670/2/src/northbridge/intel/i440b... 
File src/northbridge/intel/i440bx/romstage.c:

https://review.coreboot.org/c/coreboot/+/38670/2/src/northbridge/intel/i440b... 
PS2, Line 17: #include <console/console.h>
This header isn't needed anymore, I guess?

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38670 )

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

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/38670/2//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/38670/2//COMMIT_MSG@8 
PS2, Line 8: 
Please elaborate.
> With this bootblock messages are transmitted over serial too.

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38670 )

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

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/38670/2//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/38670/2//COMMIT_MSG@8 
PS2, Line 8:
> Please elaborate. […]

Isn't it obvious, though?

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

[Keith Hui (Code Review)]

Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/38670

to look at the new patch set (#3).

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

asus/p2b*: Move serial init into mainboard bootblock

With this bootblock messages are transmitted over serial too.

Change-Id: I6f3ee68e7c76a8c6db6d75956e6a7fb75ef83850
Signed-off-by: Keith Hui 
---
M src/mainboard/asus/p2b/Makefile.inc
A src/mainboard/asus/p2b/bootblock.c
D src/mainboard/asus/p2b/romstage.c
M src/northbridge/intel/i440bx/romstage.c
4 files changed, 15 insertions(+), 28 deletions(-)

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

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

[Keith Hui (Code Review)]

Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/38670

to look at the new patch set (#4).

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

asus/p2b*: Move serial init into mainboard bootblock

With this bootblock messages are transmitted over serial too.

Change-Id: I6f3ee68e7c76a8c6db6d75956e6a7fb75ef83850
Signed-off-by: Keith Hui 
---
M src/mainboard/asus/p2b/Makefile.inc
A src/mainboard/asus/p2b/bootblock.c
D src/mainboard/asus/p2b/romstage.c
M src/northbridge/intel/i440bx/romstage.c
4 files changed, 15 insertions(+), 28 deletions(-)

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

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

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38670 )

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

Patch Set 4: Code-Review+1

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

[Keith Hui (Code Review)]

Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Angel Pons, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/38670

to look at the new patch set (#6).

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

asus/p2b*: Move serial init into mainboard bootblock

With this bootblock messages are transmitted over serial too.

Change-Id: I6f3ee68e7c76a8c6db6d75956e6a7fb75ef83850
Signed-off-by: Keith Hui 
---
M src/mainboard/asus/p2b/Makefile.inc
A src/mainboard/asus/p2b/bootblock.c
D src/mainboard/asus/p2b/romstage.c
M src/northbridge/intel/i440bx/romstage.c
4 files changed, 15 insertions(+), 29 deletions(-)

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

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

[Keith Hui (Code Review)]

Keith Hui has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38670 )

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

Patch Set 6:

(2 comments)

https://review.coreboot.org/c/coreboot/+/38670/2/src/northbridge/intel/i440b... 
File src/northbridge/intel/i440bx/romstage.c:

https://review.coreboot.org/c/coreboot/+/38670/2/src/northbridge/intel/i440b... 
PS2, Line 24: console_init
> Where did this call go?

cpu/intel/car/romstage.c

That call will work once serial init is moved to bootblock.

https://review.coreboot.org/c/coreboot/+/38670/2/src/northbridge/intel/i440b... 
PS2, Line 17: #include <console/console.h>
> This header isn't needed anymore, I guess?

Done

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

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38670 )

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

Patch Set 6: Code-Review+2

(2 comments)

Please try to rebase this, crabbybuilder has been failing...

https://review.coreboot.org/c/coreboot/+/38670/2//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/38670/2//COMMIT_MSG@8 
PS2, Line 8:
> Isn't it obvious, though?

Done

https://review.coreboot.org/c/coreboot/+/38670/2/src/northbridge/intel/i440b... 
File src/northbridge/intel/i440bx/romstage.c:

https://review.coreboot.org/c/coreboot/+/38670/2/src/northbridge/intel/i440b... 
PS2, Line 24: console_init
> cpu/intel/car/romstage.c […]

Ack

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

[Keith Hui (Code Review)]

Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Angel Pons, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/38670

to look at the new patch set (#7).

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

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 
---
M src/mainboard/asus/p2b/Makefile.inc
A src/mainboard/asus/p2b/bootblock.c
D src/mainboard/asus/p2b/romstage.c
M src/northbridge/intel/i440bx/romstage.c
4 files changed, 15 insertions(+), 29 deletions(-)

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

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

[Angel Pons (Code Review)]

Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38670 )

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

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 
---
M src/mainboard/asus/p2b/Makefile.inc
A src/mainboard/asus/p2b/bootblock.c
D src/mainboard/asus/p2b/romstage.c
M src/northbridge/intel/i440bx/romstage.c
4 files changed, 15 insertions(+), 29 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved

diff --git a/src/mainboard/asus/p2b/Makefile.inc b/src/mainboard/asus/p2b/Makefile.inc
index ca08106..cc55c25 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 0000000..18eff07
--- /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 67ba632..0000000
--- 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 1dee03a..bdcfdc9 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();