nb/intel/gm45: Add C_ENVIRONMENT_BOOTBLOCK support

The i82801ix_early_init is now called both in the bootblock and
romstage. The rationale behind setting this up twice is to ensure
bootblock-romstage compatibility in the future if for instance VBOOT
is used.

This moves the console init to the bootblock.

The romstage now runs uncached. Adding a prog_run hooks to set up an
MTRR to cache the romstage will be done in a followup patch.

The default size of 64KiB is not modified for the bootblock as trying
to fit both EHCI and SPI flash debugging needs a more space and 64KiB
is the next power of 2 size that fits it.

TESTED on Thinkpad X200.

Change-Id: I8f59736cb54377973215f35e35d2cbcd1d82c374
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35992
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>

3 files changed, 39 insertions, 19 deletions

diff --git a/src/mainboard/lenovo/t400/Makefile.inc b/src/mainboard/lenovo/t400/Makefile.inc
index d0ee1537f4..b3ca78d2de 100644
--- a/src/mainboard/lenovo/t400/Makefile.inc
+++ b/src/mainboard/lenovo/t400/Makefile.inc
@@ -13,7 +13,8 @@
 ## GNU General Public License for more details.
 ##
 
-romstage-y += dock.c
+bootblock-y += bootblock.c
+bootblock-y += dock.c
 
 subdirs-y += variants/$(VARIANT_DIR)/
 
diff --git a/src/mainboard/lenovo/t400/bootblock.c b/src/mainboard/lenovo/t400/bootblock.c
new file mode 100644
index 0000000000..c9f3cf6b5b
--- /dev/null
+++ b/src/mainboard/lenovo/t400/bootblock.c
@@ -0,0 +1,37 @@
+/*
+ * 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; version 2 of
+ * the License.
+ *
+ * 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 <console/console.h>
+#include <bootblock_common.h>
+#include "dock.h"
+
+static int dock_err;
+
+void bootblock_mainboard_early_init(void)
+{
+	/* Minimal setup to detect dock */
+	dock_err = pc87382_early();
+	if (dock_err == 0)
+		dock_connect();
+}
+
+void bootblock_mainboard_init(void)
+{
+	/* Console is not yet initialized in bootblock_mainboard_early_init,
+	   so we print the dock information here */
+	if (dock_err)
+		printk(BIOS_ERR, "DOCK: Failed to init pc87382\n");
+	else
+		dock_info();
+}
diff --git a/src/mainboard/lenovo/t400/romstage.c b/src/mainboard/lenovo/t400/romstage.c
index e8215654e1..4b0a4c7352 100644
--- a/src/mainboard/lenovo/t400/romstage.c
+++ b/src/mainboard/lenovo/t400/romstage.c
@@ -18,7 +18,6 @@
 #include <southbridge/intel/common/gpio.h>
 #include <northbridge/intel/gm45/gm45.h>
 #include <drivers/lenovo/hybrid_graphics/hybrid_graphics.h>
-#include "dock.h"
 
 static void hybrid_graphics_init(sysinfo_t *sysinfo)
 {
@@ -30,16 +29,6 @@ static void hybrid_graphics_init(sysinfo_t *sysinfo)
 	sysinfo->enable_peg = peg;
 }
 
-static int dock_err;
-
-void mb_setup_superio(void)
-{
-	/* Minimal setup to detect dock */
-	dock_err = pc87382_early();
-	if (dock_err == 0)
-		dock_connect();
-}
-
 void get_mb_spd_addrmap(u8 *spd_addrmap)
 {
 	spd_addrmap[0] = 0x50;
@@ -48,13 +37,6 @@ void get_mb_spd_addrmap(u8 *spd_addrmap)
 
 void mb_pre_raminit_setup(sysinfo_t *sysinfo)
 {
-	/* Console is not yet initialized in mb_setup_superio, so we print
-	   the dock information here */
-	if (dock_err)
-		printk(BIOS_ERR, "DOCK: Failed to init pc87382\n");
-	else
-		dock_info();
-
 	if (CONFIG(BOARD_LENOVO_R500)) {
 		int use_integrated = get_gpio(21);
 		printk(BIOS_DEBUG, "R500 variant found with an %s GPU\n",