New subject: Change in ...coreboot[master]: [WIP]northbridge/intel/sandybridge: Set up console on bootblock

4 Jun 2019

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33187
Change subject: northbridge/intel/sandybridge: Set up console on bootblock
......................................................................
northbridge/intel/sandybridge: Set up console on bootblock
The assmption is made that setting up southbridge gpio's is not needed
for console in the bootblock.
Change-Id: I7b242e7cde0c5799f63331b817d863a0d6c00ab3
Signed-off-by: Arthur Heymans arthur@aheymans.xyz
---
M src/mainboard/apple/macbookair4_2/Makefile.inc
R src/mainboard/apple/macbookair4_2/early_init.c
M src/mainboard/asrock/b75pro3-m/Makefile.inc
R src/mainboard/asrock/b75pro3-m/early_init.c
M src/mainboard/asus/h61m-cs/Makefile.inc
R src/mainboard/asus/h61m-cs/early_init.c
M src/mainboard/asus/maximus_iv_gene-z/Makefile.inc
R src/mainboard/asus/maximus_iv_gene-z/early_init.c
M src/mainboard/asus/p8h61-m_lx/Makefile.inc
R src/mainboard/asus/p8h61-m_lx/early_init.c
M src/mainboard/asus/p8h61-m_pro/Makefile.inc
R src/mainboard/asus/p8h61-m_pro/early_init.c
M src/mainboard/compulab/intense_pc/Makefile.inc
R src/mainboard/compulab/intense_pc/early_init.c
M src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc
R src/mainboard/gigabyte/ga-b75m-d3h/early_init.c
M src/mainboard/gigabyte/ga-h61m-s2pv/Makefile.inc
R src/mainboard/gigabyte/ga-h61m-s2pv/early_init.c
M src/mainboard/google/butterfly/Makefile.inc
R src/mainboard/google/butterfly/early_init.c
M src/mainboard/google/link/Makefile.inc
R src/mainboard/google/link/early_init.c
M src/mainboard/google/parrot/Makefile.inc
R src/mainboard/google/parrot/early_init.c
M src/mainboard/google/stout/Makefile.inc
R src/mainboard/google/stout/early_init.c
M src/mainboard/hp/2570p/Makefile.inc
R src/mainboard/hp/2570p/early_init.c
M src/mainboard/hp/2760p/Makefile.inc
R src/mainboard/hp/2760p/early_init.c
M src/mainboard/hp/8460p/Makefile.inc
R src/mainboard/hp/8460p/early_init.c
M src/mainboard/hp/8470p/Makefile.inc
R src/mainboard/hp/8470p/early_init.c
M src/mainboard/hp/8770w/Makefile.inc
R src/mainboard/hp/8770w/early_init.c
M src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc
R src/mainboard/hp/compaq_8200_elite_sff/early_init.c
M src/mainboard/hp/folio_9470m/Makefile.inc
R src/mainboard/hp/folio_9470m/early_init.c
M src/mainboard/hp/revolve_810_g1/Makefile.inc
R src/mainboard/hp/revolve_810_g1/early_init.c
M src/mainboard/intel/dcp847ske/Makefile.inc
R src/mainboard/intel/dcp847ske/early_init.c
M src/mainboard/intel/emeraldlake2/Makefile.inc
R src/mainboard/intel/emeraldlake2/early_init.c
M src/mainboard/kontron/ktqm77/Makefile.inc
R src/mainboard/kontron/ktqm77/early_init.c
M src/mainboard/lenovo/l520/Makefile.inc
R src/mainboard/lenovo/l520/early_init.c
M src/mainboard/lenovo/s230u/Makefile.inc
R src/mainboard/lenovo/s230u/early_init.c
M src/mainboard/lenovo/t420/Makefile.inc
R src/mainboard/lenovo/t420/early_init.c
M src/mainboard/lenovo/t420s/Makefile.inc
R src/mainboard/lenovo/t420s/early_init.c
M src/mainboard/lenovo/t430/Makefile.inc
R src/mainboard/lenovo/t430/early_init.c
M src/mainboard/lenovo/t430s/Makefile.inc
R src/mainboard/lenovo/t430s/early_init.c
M src/mainboard/lenovo/t520/Makefile.inc
R src/mainboard/lenovo/t520/early_init.c
M src/mainboard/lenovo/t530/Makefile.inc
R src/mainboard/lenovo/t530/early_init.c
M src/mainboard/lenovo/x131e/Makefile.inc
R src/mainboard/lenovo/x131e/early_init.c
M src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc
R src/mainboard/lenovo/x1_carbon_gen1/early_init.c
M src/mainboard/lenovo/x220/Makefile.inc
R src/mainboard/lenovo/x220/early_init.c
M src/mainboard/lenovo/x230/Makefile.inc
R src/mainboard/lenovo/x230/early_init.c
M src/mainboard/msi/ms7707/Makefile.inc
R src/mainboard/msi/ms7707/early_init.c
M src/mainboard/roda/rv11/Makefile.inc
R src/mainboard/roda/rv11/early_init.c
M src/mainboard/samsung/lumpy/Makefile.inc
R src/mainboard/samsung/lumpy/early_init.c
M src/mainboard/samsung/stumpy/Makefile.inc
R src/mainboard/samsung/stumpy/early_init.c
M src/mainboard/sapphire/pureplatinumh61/Makefile.inc
R src/mainboard/sapphire/pureplatinumh61/early_init.c
M src/northbridge/intel/sandybridge/romstage.c
M src/southbridge/intel/bd82x6x/bootblock.c
M src/southbridge/intel/bd82x6x/early_pch.c
M src/southbridge/intel/bd82x6x/pch.h
86 files changed, 135 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/33187/1

diff --git a/src/mainboard/apple/macbookair4_2/Makefile.inc b/src/mainboard/apple/macbookair4_2/Makefile.inc
index a41ee25..b80d5da 100644
--- a/src/mainboard/apple/macbookair4_2/Makefile.inc
+++ b/src/mainboard/apple/macbookair4_2/Makefile.inc
@@ -6,3 +6,6 @@
 spd.bin-type := spd
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/apple/macbookair4_2/romstage.c b/src/mainboard/apple/macbookair4_2/early_init.c
similarity index 100%
rename from src/mainboard/apple/macbookair4_2/romstage.c
rename to src/mainboard/apple/macbookair4_2/early_init.c
diff --git a/src/mainboard/asrock/b75pro3-m/Makefile.inc b/src/mainboard/asrock/b75pro3-m/Makefile.inc
index 017967b..3ca89fb 100644
--- a/src/mainboard/asrock/b75pro3-m/Makefile.inc
+++ b/src/mainboard/asrock/b75pro3-m/Makefile.inc
@@ -16,3 +16,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/asrock/b75pro3-m/romstage.c b/src/mainboard/asrock/b75pro3-m/early_init.c
similarity index 100%
rename from src/mainboard/asrock/b75pro3-m/romstage.c
rename to src/mainboard/asrock/b75pro3-m/early_init.c
diff --git a/src/mainboard/asus/h61m-cs/Makefile.inc b/src/mainboard/asus/h61m-cs/Makefile.inc
index ebe01ae..261e206 100644
--- a/src/mainboard/asus/h61m-cs/Makefile.inc
+++ b/src/mainboard/asus/h61m-cs/Makefile.inc
@@ -1,2 +1,5 @@
 romstage-y += gpio.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/asus/h61m-cs/romstage.c b/src/mainboard/asus/h61m-cs/early_init.c
similarity index 100%
rename from src/mainboard/asus/h61m-cs/romstage.c
rename to src/mainboard/asus/h61m-cs/early_init.c
diff --git a/src/mainboard/asus/maximus_iv_gene-z/Makefile.inc b/src/mainboard/asus/maximus_iv_gene-z/Makefile.inc
index f81e828..dd91210 100644
--- a/src/mainboard/asus/maximus_iv_gene-z/Makefile.inc
+++ b/src/mainboard/asus/maximus_iv_gene-z/Makefile.inc
@@ -16,3 +16,6 @@
romstage-y += gpio.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/asus/maximus_iv_gene-z/romstage.c b/src/mainboard/asus/maximus_iv_gene-z/early_init.c
similarity index 100%
rename from src/mainboard/asus/maximus_iv_gene-z/romstage.c
rename to src/mainboard/asus/maximus_iv_gene-z/early_init.c
diff --git a/src/mainboard/asus/p8h61-m_lx/Makefile.inc b/src/mainboard/asus/p8h61-m_lx/Makefile.inc
index 7c1bf9e..0ef22db 100644
--- a/src/mainboard/asus/p8h61-m_lx/Makefile.inc
+++ b/src/mainboard/asus/p8h61-m_lx/Makefile.inc
@@ -16,3 +16,6 @@
romstage-y += gpio.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/asus/p8h61-m_lx/romstage.c b/src/mainboard/asus/p8h61-m_lx/early_init.c
similarity index 100%
rename from src/mainboard/asus/p8h61-m_lx/romstage.c
rename to src/mainboard/asus/p8h61-m_lx/early_init.c
diff --git a/src/mainboard/asus/p8h61-m_pro/Makefile.inc b/src/mainboard/asus/p8h61-m_pro/Makefile.inc
index ea035d3..5210d08 100644
--- a/src/mainboard/asus/p8h61-m_pro/Makefile.inc
+++ b/src/mainboard/asus/p8h61-m_pro/Makefile.inc
@@ -1,3 +1,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/asus/p8h61-m_pro/romstage.c b/src/mainboard/asus/p8h61-m_pro/early_init.c
similarity index 100%
rename from src/mainboard/asus/p8h61-m_pro/romstage.c
rename to src/mainboard/asus/p8h61-m_pro/early_init.c
diff --git a/src/mainboard/compulab/intense_pc/Makefile.inc b/src/mainboard/compulab/intense_pc/Makefile.inc
index ea035d3..5210d08 100644
--- a/src/mainboard/compulab/intense_pc/Makefile.inc
+++ b/src/mainboard/compulab/intense_pc/Makefile.inc
@@ -1,3 +1,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/compulab/intense_pc/romstage.c b/src/mainboard/compulab/intense_pc/early_init.c
similarity index 100%
rename from src/mainboard/compulab/intense_pc/romstage.c
rename to src/mainboard/compulab/intense_pc/early_init.c
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc b/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc
index 07fc277..53aae3d 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc
@@ -20,3 +20,6 @@
 subdirs-y += variants/$(VARIANT_DIR)
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/romstage.c b/src/mainboard/gigabyte/ga-b75m-d3h/early_init.c
similarity index 100%
rename from src/mainboard/gigabyte/ga-b75m-d3h/romstage.c
rename to src/mainboard/gigabyte/ga-b75m-d3h/early_init.c
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/Makefile.inc b/src/mainboard/gigabyte/ga-h61m-s2pv/Makefile.inc
index ea035d3..5210d08 100644
--- a/src/mainboard/gigabyte/ga-h61m-s2pv/Makefile.inc
+++ b/src/mainboard/gigabyte/ga-h61m-s2pv/Makefile.inc
@@ -1,3 +1,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/romstage.c b/src/mainboard/gigabyte/ga-h61m-s2pv/early_init.c
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/romstage.c
rename to src/mainboard/gigabyte/ga-h61m-s2pv/early_init.c
diff --git a/src/mainboard/google/butterfly/Makefile.inc b/src/mainboard/google/butterfly/Makefile.inc
index 8033e1c..9c6920e 100644
--- a/src/mainboard/google/butterfly/Makefile.inc
+++ b/src/mainboard/google/butterfly/Makefile.inc
@@ -22,3 +22,6 @@
 smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/google/butterfly/romstage.c b/src/mainboard/google/butterfly/early_init.c
similarity index 100%
rename from src/mainboard/google/butterfly/romstage.c
rename to src/mainboard/google/butterfly/early_init.c
diff --git a/src/mainboard/google/link/Makefile.inc b/src/mainboard/google/link/Makefile.inc
index 89bb365..84e6e5e 100644
--- a/src/mainboard/google/link/Makefile.inc
+++ b/src/mainboard/google/link/Makefile.inc
@@ -41,3 +41,6 @@
 spd.bin-file := $(SPD_BIN)
 spd.bin-type := spd
 romstage-y += gpio.c
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/early_init.c
similarity index 100%
rename from src/mainboard/google/link/romstage.c
rename to src/mainboard/google/link/early_init.c
diff --git a/src/mainboard/google/parrot/Makefile.inc b/src/mainboard/google/parrot/Makefile.inc
index 393d582..9f057e5 100644
--- a/src/mainboard/google/parrot/Makefile.inc
+++ b/src/mainboard/google/parrot/Makefile.inc
@@ -20,3 +20,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/early_init.c
similarity index 100%
rename from src/mainboard/google/parrot/romstage.c
rename to src/mainboard/google/parrot/early_init.c
diff --git a/src/mainboard/google/stout/Makefile.inc b/src/mainboard/google/stout/Makefile.inc
index be1f0fe..652dc6f 100644
--- a/src/mainboard/google/stout/Makefile.inc
+++ b/src/mainboard/google/stout/Makefile.inc
@@ -25,3 +25,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/early_init.c
similarity index 100%
rename from src/mainboard/google/stout/romstage.c
rename to src/mainboard/google/stout/early_init.c
diff --git a/src/mainboard/hp/2570p/Makefile.inc b/src/mainboard/hp/2570p/Makefile.inc
index 7a00cce..9242841 100644
--- a/src/mainboard/hp/2570p/Makefile.inc
+++ b/src/mainboard/hp/2570p/Makefile.inc
@@ -16,3 +16,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/hp/2570p/romstage.c b/src/mainboard/hp/2570p/early_init.c
similarity index 100%
rename from src/mainboard/hp/2570p/romstage.c
rename to src/mainboard/hp/2570p/early_init.c
diff --git a/src/mainboard/hp/2760p/Makefile.inc b/src/mainboard/hp/2760p/Makefile.inc
index 7a00cce..9242841 100644
--- a/src/mainboard/hp/2760p/Makefile.inc
+++ b/src/mainboard/hp/2760p/Makefile.inc
@@ -16,3 +16,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/hp/2760p/romstage.c b/src/mainboard/hp/2760p/early_init.c
similarity index 100%
rename from src/mainboard/hp/2760p/romstage.c
rename to src/mainboard/hp/2760p/early_init.c
diff --git a/src/mainboard/hp/8460p/Makefile.inc b/src/mainboard/hp/8460p/Makefile.inc
index 7a00cce..9242841 100644
--- a/src/mainboard/hp/8460p/Makefile.inc
+++ b/src/mainboard/hp/8460p/Makefile.inc
@@ -16,3 +16,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/hp/8460p/romstage.c b/src/mainboard/hp/8460p/early_init.c
similarity index 100%
rename from src/mainboard/hp/8460p/romstage.c
rename to src/mainboard/hp/8460p/early_init.c
diff --git a/src/mainboard/hp/8470p/Makefile.inc b/src/mainboard/hp/8470p/Makefile.inc
index 7a00cce..9242841 100644
--- a/src/mainboard/hp/8470p/Makefile.inc
+++ b/src/mainboard/hp/8470p/Makefile.inc
@@ -16,3 +16,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/hp/8470p/romstage.c b/src/mainboard/hp/8470p/early_init.c
similarity index 100%
rename from src/mainboard/hp/8470p/romstage.c
rename to src/mainboard/hp/8470p/early_init.c
diff --git a/src/mainboard/hp/8770w/Makefile.inc b/src/mainboard/hp/8770w/Makefile.inc
index d57c9b5..b480ae4 100644
--- a/src/mainboard/hp/8770w/Makefile.inc
+++ b/src/mainboard/hp/8770w/Makefile.inc
@@ -14,3 +14,6 @@
 ##
romstage-y += gpio.c
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/hp/8770w/romstage.c b/src/mainboard/hp/8770w/early_init.c
similarity index 100%
rename from src/mainboard/hp/8770w/romstage.c
rename to src/mainboard/hp/8770w/early_init.c
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc b/src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc
index ebe01ae..261e206 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc
+++ b/src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc
@@ -1,2 +1,5 @@
 romstage-y += gpio.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/romstage.c b/src/mainboard/hp/compaq_8200_elite_sff/early_init.c
similarity index 100%
rename from src/mainboard/hp/compaq_8200_elite_sff/romstage.c
rename to src/mainboard/hp/compaq_8200_elite_sff/early_init.c
diff --git a/src/mainboard/hp/folio_9470m/Makefile.inc b/src/mainboard/hp/folio_9470m/Makefile.inc
index 7a00cce..9242841 100644
--- a/src/mainboard/hp/folio_9470m/Makefile.inc
+++ b/src/mainboard/hp/folio_9470m/Makefile.inc
@@ -16,3 +16,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/hp/folio_9470m/romstage.c b/src/mainboard/hp/folio_9470m/early_init.c
similarity index 100%
rename from src/mainboard/hp/folio_9470m/romstage.c
rename to src/mainboard/hp/folio_9470m/early_init.c
diff --git a/src/mainboard/hp/revolve_810_g1/Makefile.inc b/src/mainboard/hp/revolve_810_g1/Makefile.inc
index 7a211f4..e5c8647 100644
--- a/src/mainboard/hp/revolve_810_g1/Makefile.inc
+++ b/src/mainboard/hp/revolve_810_g1/Makefile.inc
@@ -19,3 +19,6 @@
# FIXME: Other varients with same size onboard ram may exist.
 SPD_SOURCES = hynix_4g
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/hp/revolve_810_g1/romstage.c b/src/mainboard/hp/revolve_810_g1/early_init.c
similarity index 100%
rename from src/mainboard/hp/revolve_810_g1/romstage.c
rename to src/mainboard/hp/revolve_810_g1/early_init.c
diff --git a/src/mainboard/intel/dcp847ske/Makefile.inc b/src/mainboard/intel/dcp847ske/Makefile.inc
index 4d516f6..3803149 100644
--- a/src/mainboard/intel/dcp847ske/Makefile.inc
+++ b/src/mainboard/intel/dcp847ske/Makefile.inc
@@ -2,3 +2,6 @@
 romstage-y += gpio.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
 smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/intel/dcp847ske/romstage.c b/src/mainboard/intel/dcp847ske/early_init.c
similarity index 100%
rename from src/mainboard/intel/dcp847ske/romstage.c
rename to src/mainboard/intel/dcp847ske/early_init.c
diff --git a/src/mainboard/intel/emeraldlake2/Makefile.inc b/src/mainboard/intel/emeraldlake2/Makefile.inc
index b3bf53f..f2d7b97 100644
--- a/src/mainboard/intel/emeraldlake2/Makefile.inc
+++ b/src/mainboard/intel/emeraldlake2/Makefile.inc
@@ -16,3 +16,6 @@
 romstage-y += chromeos.c
 ramstage-y += chromeos.c
 romstage-y += gpio.c
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/intel/emeraldlake2/romstage.c b/src/mainboard/intel/emeraldlake2/early_init.c
similarity index 100%
rename from src/mainboard/intel/emeraldlake2/romstage.c
rename to src/mainboard/intel/emeraldlake2/early_init.c
diff --git a/src/mainboard/kontron/ktqm77/Makefile.inc b/src/mainboard/kontron/ktqm77/Makefile.inc
index ea035d3..5210d08 100644
--- a/src/mainboard/kontron/ktqm77/Makefile.inc
+++ b/src/mainboard/kontron/ktqm77/Makefile.inc
@@ -1,3 +1,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/kontron/ktqm77/romstage.c b/src/mainboard/kontron/ktqm77/early_init.c
similarity index 100%
rename from src/mainboard/kontron/ktqm77/romstage.c
rename to src/mainboard/kontron/ktqm77/early_init.c
diff --git a/src/mainboard/lenovo/l520/Makefile.inc b/src/mainboard/lenovo/l520/Makefile.inc
index 2aa7f0f..f1a1016 100644
--- a/src/mainboard/lenovo/l520/Makefile.inc
+++ b/src/mainboard/lenovo/l520/Makefile.inc
@@ -18,3 +18,6 @@
 smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/l520/romstage.c b/src/mainboard/lenovo/l520/early_init.c
similarity index 100%
rename from src/mainboard/lenovo/l520/romstage.c
rename to src/mainboard/lenovo/l520/early_init.c
diff --git a/src/mainboard/lenovo/s230u/Makefile.inc b/src/mainboard/lenovo/s230u/Makefile.inc
index dea2e4e..0e4c5e8 100644
--- a/src/mainboard/lenovo/s230u/Makefile.inc
+++ b/src/mainboard/lenovo/s230u/Makefile.inc
@@ -15,3 +15,6 @@
 SPD_SOURCES += hynix_2gb			# 0b1000
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/s230u/romstage.c b/src/mainboard/lenovo/s230u/early_init.c
similarity index 100%
rename from src/mainboard/lenovo/s230u/romstage.c
rename to src/mainboard/lenovo/s230u/early_init.c
diff --git a/src/mainboard/lenovo/t420/Makefile.inc b/src/mainboard/lenovo/t420/Makefile.inc
index 2dab950..1a4c50c 100644
--- a/src/mainboard/lenovo/t420/Makefile.inc
+++ b/src/mainboard/lenovo/t420/Makefile.inc
@@ -17,3 +17,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/t420/romstage.c b/src/mainboard/lenovo/t420/early_init.c
similarity index 100%
rename from src/mainboard/lenovo/t420/romstage.c
rename to src/mainboard/lenovo/t420/early_init.c
diff --git a/src/mainboard/lenovo/t420s/Makefile.inc b/src/mainboard/lenovo/t420s/Makefile.inc
index 2dab950..1a4c50c 100644
--- a/src/mainboard/lenovo/t420s/Makefile.inc
+++ b/src/mainboard/lenovo/t420s/Makefile.inc
@@ -17,3 +17,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/t420s/romstage.c b/src/mainboard/lenovo/t420s/early_init.c
similarity index 100%
rename from src/mainboard/lenovo/t420s/romstage.c
rename to src/mainboard/lenovo/t420s/early_init.c
diff --git a/src/mainboard/lenovo/t430/Makefile.inc b/src/mainboard/lenovo/t430/Makefile.inc
index ada25f7..0ca0ecd 100644
--- a/src/mainboard/lenovo/t430/Makefile.inc
+++ b/src/mainboard/lenovo/t430/Makefile.inc
@@ -3,3 +3,6 @@
 smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/t430/romstage.c b/src/mainboard/lenovo/t430/early_init.c
similarity index 100%
rename from src/mainboard/lenovo/t430/romstage.c
rename to src/mainboard/lenovo/t430/early_init.c
diff --git a/src/mainboard/lenovo/t430s/Makefile.inc b/src/mainboard/lenovo/t430s/Makefile.inc
index d70c22e..05763f9 100644
--- a/src/mainboard/lenovo/t430s/Makefile.inc
+++ b/src/mainboard/lenovo/t430s/Makefile.inc
@@ -19,3 +19,6 @@
 ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
 subdirs-$(CONFIG_BOARD_LENOVO_T431S) += variants/$(VARIANT_DIR)/spd
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/t430s/romstage.c b/src/mainboard/lenovo/t430s/early_init.c
similarity index 100%
rename from src/mainboard/lenovo/t430s/romstage.c
rename to src/mainboard/lenovo/t430s/early_init.c
diff --git a/src/mainboard/lenovo/t520/Makefile.inc b/src/mainboard/lenovo/t520/Makefile.inc
index 7187013..ccf810e 100644
--- a/src/mainboard/lenovo/t520/Makefile.inc
+++ b/src/mainboard/lenovo/t520/Makefile.inc
@@ -17,3 +17,6 @@
 romstage-y += variants/$(VARIANT_DIR)/gpio.c
 romstage-y += variants/$(VARIANT_DIR)/romstage.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/t520/romstage.c b/src/mainboard/lenovo/t520/early_init.c
similarity index 100%
rename from src/mainboard/lenovo/t520/romstage.c
rename to src/mainboard/lenovo/t520/early_init.c
diff --git a/src/mainboard/lenovo/t530/Makefile.inc b/src/mainboard/lenovo/t530/Makefile.inc
index 7187013..ccf810e 100644
--- a/src/mainboard/lenovo/t530/Makefile.inc
+++ b/src/mainboard/lenovo/t530/Makefile.inc
@@ -17,3 +17,6 @@
 romstage-y += variants/$(VARIANT_DIR)/gpio.c
 romstage-y += variants/$(VARIANT_DIR)/romstage.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/t530/romstage.c b/src/mainboard/lenovo/t530/early_init.c
similarity index 100%
rename from src/mainboard/lenovo/t530/romstage.c
rename to src/mainboard/lenovo/t530/early_init.c
diff --git a/src/mainboard/lenovo/x131e/Makefile.inc b/src/mainboard/lenovo/x131e/Makefile.inc
index 7a00cce..9242841 100644
--- a/src/mainboard/lenovo/x131e/Makefile.inc
+++ b/src/mainboard/lenovo/x131e/Makefile.inc
@@ -16,3 +16,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/x131e/romstage.c b/src/mainboard/lenovo/x131e/early_init.c
similarity index 100%
rename from src/mainboard/lenovo/x131e/romstage.c
rename to src/mainboard/lenovo/x131e/early_init.c
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc b/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc
index ee08d78..5a83f28 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc
+++ b/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc
@@ -19,3 +19,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c b/src/mainboard/lenovo/x1_carbon_gen1/early_init.c
similarity index 100%
rename from src/mainboard/lenovo/x1_carbon_gen1/romstage.c
rename to src/mainboard/lenovo/x1_carbon_gen1/early_init.c
diff --git a/src/mainboard/lenovo/x220/Makefile.inc b/src/mainboard/lenovo/x220/Makefile.inc
index 2c52c21..c988b80 100644
--- a/src/mainboard/lenovo/x220/Makefile.inc
+++ b/src/mainboard/lenovo/x220/Makefile.inc
@@ -18,3 +18,6 @@
 romstage-y += variants/$(VARIANT_DIR)/romstage.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/x220/romstage.c b/src/mainboard/lenovo/x220/early_init.c
similarity index 100%
rename from src/mainboard/lenovo/x220/romstage.c
rename to src/mainboard/lenovo/x220/early_init.c
diff --git a/src/mainboard/lenovo/x230/Makefile.inc b/src/mainboard/lenovo/x230/Makefile.inc
index 2dab950..1a4c50c 100644
--- a/src/mainboard/lenovo/x230/Makefile.inc
+++ b/src/mainboard/lenovo/x230/Makefile.inc
@@ -17,3 +17,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/x230/romstage.c b/src/mainboard/lenovo/x230/early_init.c
similarity index 100%
rename from src/mainboard/lenovo/x230/romstage.c
rename to src/mainboard/lenovo/x230/early_init.c
diff --git a/src/mainboard/msi/ms7707/Makefile.inc b/src/mainboard/msi/ms7707/Makefile.inc
index 3dae61e..ea30f64 100644
--- a/src/mainboard/msi/ms7707/Makefile.inc
+++ b/src/mainboard/msi/ms7707/Makefile.inc
@@ -1 +1,4 @@
 romstage-y += gpio.c
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/msi/ms7707/romstage.c b/src/mainboard/msi/ms7707/early_init.c
similarity index 100%
rename from src/mainboard/msi/ms7707/romstage.c
rename to src/mainboard/msi/ms7707/early_init.c
diff --git a/src/mainboard/roda/rv11/Makefile.inc b/src/mainboard/roda/rv11/Makefile.inc
index 5b5ca65..fd4c498 100644
--- a/src/mainboard/roda/rv11/Makefile.inc
+++ b/src/mainboard/roda/rv11/Makefile.inc
@@ -19,3 +19,6 @@
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/roda/rv11/romstage.c b/src/mainboard/roda/rv11/early_init.c
similarity index 100%
rename from src/mainboard/roda/rv11/romstage.c
rename to src/mainboard/roda/rv11/early_init.c
diff --git a/src/mainboard/samsung/lumpy/Makefile.inc b/src/mainboard/samsung/lumpy/Makefile.inc
index 7f8f966..21c855f 100644
--- a/src/mainboard/samsung/lumpy/Makefile.inc
+++ b/src/mainboard/samsung/lumpy/Makefile.inc
@@ -30,3 +30,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/early_init.c
similarity index 100%
rename from src/mainboard/samsung/lumpy/romstage.c
rename to src/mainboard/samsung/lumpy/early_init.c
diff --git a/src/mainboard/samsung/stumpy/Makefile.inc b/src/mainboard/samsung/stumpy/Makefile.inc
index a91a061..f50c637 100644
--- a/src/mainboard/samsung/stumpy/Makefile.inc
+++ b/src/mainboard/samsung/stumpy/Makefile.inc
@@ -18,3 +18,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/early_init.c
similarity index 100%
rename from src/mainboard/samsung/stumpy/romstage.c
rename to src/mainboard/samsung/stumpy/early_init.c
diff --git a/src/mainboard/sapphire/pureplatinumh61/Makefile.inc b/src/mainboard/sapphire/pureplatinumh61/Makefile.inc
index 7c555f9..a584a16 100644
--- a/src/mainboard/sapphire/pureplatinumh61/Makefile.inc
+++ b/src/mainboard/sapphire/pureplatinumh61/Makefile.inc
@@ -17,3 +17,6 @@
 romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/sapphire/pureplatinumh61/romstage.c b/src/mainboard/sapphire/pureplatinumh61/early_init.c
similarity index 100%
rename from src/mainboard/sapphire/pureplatinumh61/romstage.c
rename to src/mainboard/sapphire/pureplatinumh61/early_init.c
diff --git a/src/northbridge/intel/sandybridge/romstage.c b/src/northbridge/intel/sandybridge/romstage.c
index 336b47e..3f7bae2 100644
--- a/src/northbridge/intel/sandybridge/romstage.c
+++ b/src/northbridge/intel/sandybridge/romstage.c
@@ -28,6 +28,7 @@
 #include <northbridge/intel/sandybridge/chip.h>
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <southbridge/intel/common/pmclib.h>
+#include <southbridge/intel/common/gpio.h>
 #include <elog.h>
static void early_pch_reset_pmcon(void)
@@ -53,11 +54,8 @@
    if (bist == 0)
    	enable_lapic();
-	/* Init LPC, GPIO ... */
-	romstage_pch_init();
-
-	/* Initialize superio */
-	mainboard_config_superio();
+	/* Init GPIO */
+	setup_pch_gpios(&mainboard_gpio_map);
/* USB is initialized in MRC if MRC is used.  */
    if (CONFIG(USE_NATIVE_RAMINIT)) {
diff --git a/src/southbridge/intel/bd82x6x/bootblock.c b/src/southbridge/intel/bd82x6x/bootblock.c
index ef64825..452fb4f 100644
--- a/src/southbridge/intel/bd82x6x/bootblock.c
+++ b/src/southbridge/intel/bd82x6x/bootblock.c
@@ -14,7 +14,9 @@
  */
#include <cpu/intel/car/bootblock.h>
+#include <northbridge/intel/sandybridge/sandybridge.h>
 #include <device/pci_ops.h>
+#include <bootblock_common.h>
 #include "pch.h"
/*
@@ -78,3 +80,10 @@
    /* Enable upper 128bytes of CMOS */
    RCBA32(RC) = (1 << 2);
 }
+
+void bootblock_mainboard_early_init(void)
+{
+	pch_enable_lpc();
+
+	mainboard_config_superio();
+}
diff --git a/src/southbridge/intel/bd82x6x/early_pch.c b/src/southbridge/intel/bd82x6x/early_pch.c
index c166f79..5619133 100644
--- a/src/southbridge/intel/bd82x6x/early_pch.c
+++ b/src/southbridge/intel/bd82x6x/early_pch.c
@@ -264,10 +264,3 @@
pch_generic_setup();
 }
-
-void romstage_pch_init(void)
-{
-	pch_enable_lpc();
-
-	setup_pch_gpios(&mainboard_gpio_map);
-}
diff --git a/src/southbridge/intel/bd82x6x/pch.h b/src/southbridge/intel/bd82x6x/pch.h
index 9d9570b..9102bb5 100644
--- a/src/southbridge/intel/bd82x6x/pch.h
+++ b/src/southbridge/intel/bd82x6x/pch.h
@@ -76,7 +76,6 @@
 void mainboard_rcba_config(void);
 void early_pch_init_native(void);
 void bootblock_pch_init(void);
-void romstage_pch_init(void);
 void early_pch_init_native_dmi_pre(void);
 void early_pch_init_native_dmi_post(void);
-- 
To view, visit https://review.coreboot.org/c/coreboot/+/33187
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I7b242e7cde0c5799f63331b817d863a0d6c00ab3
Gerrit-Change-Number: 33187
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans arthur@aheymans.xyz
Gerrit-MessageType: newchange



    

Change in ...coreboot[master]: northbridge/intel/sandybridge: Set up console on bootblock