nb/intel/sandybridge: Move to C_ENVIRONMENT_BOOTBLOCK

There is some overlap between romstage and bootblock.
LPC setup and BAR initialization is now done twice.
The rationale is that the romstage should not depend too
much on the bootblock, since it can reside in a RO fmap
region.

Enabling the console will be done in a followup patch.

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

src/mainboard/apple/macbookair4_2/Makefile.inc

@@ -1,3 +1,4 @@
+bootblock-y += gpio.c
 romstage-y += gpio.c
 ramstage-y += gnvs.c
 

src/mainboard/asrock/b75pro3-m/Makefile.inc

@@ -13,6 +13,7 @@
 ## GNU General Public License for more details.
 ##
 
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/asus/h61m-cs/Makefile.inc

@@ -1,2 +1,3 @@
+bootblock-y += gpio.c
 romstage-y += gpio.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/asus/maximus_iv_gene-z/Makefile.inc

@@ -14,5 +14,6 @@
 ## GNU General Public License for more details.
 ##
 
+bootblock-y += gpio.c
 romstage-y += gpio.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/asus/p8h61-m_lx/Makefile.inc

@@ -14,5 +14,6 @@
 ## GNU General Public License for more details.
 ##
 
+bootblock-y += gpio.c
 romstage-y += gpio.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/asus/p8h61-m_pro/Makefile.inc

@@ -1,3 +1,4 @@
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/asus/p8z77-m_pro/Makefile.inc

@@ -14,6 +14,7 @@
 ## GNU General Public License for more details.
 ##
 
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/compulab/intense_pc/Makefile.inc

@@ -1,3 +1,4 @@
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc

@@ -13,6 +13,7 @@
 ## GNU General Public License for more details.
 ##
 
+bootblock-y += variants/$(VARIANT_DIR)/gpio.c
 romstage-y += variants/$(VARIANT_DIR)/gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads

src/mainboard/gigabyte/ga-h61m-s2pv/Makefile.inc

@@ -1,3 +1,4 @@
+bootblock-y += variants/$(VARIANT_DIR)/gpio.c
 romstage-y += variants/$(VARIANT_DIR)/gpio.c
 
 ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c

src/mainboard/google/butterfly/Makefile.inc

@@ -17,6 +17,7 @@ ramstage-y += ec.c
 
 romstage-y += chromeos.c
 ramstage-y += chromeos.c
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 smm-y += mainboard_smi.c

src/mainboard/google/link/Makefile.inc

@@ -40,4 +40,5 @@ $(SPD_BIN): $(SPD_DEPS)
 cbfs-files-y += spd.bin
 spd.bin-file := $(SPD_BIN)
 spd.bin-type := spd
+bootblock-y += gpio.c
 romstage-y += gpio.c

src/mainboard/google/parrot/Makefile.inc

@@ -17,6 +17,7 @@ ramstage-y += ec.c
 
 romstage-$(CONFIG_CHROMEOS) += chromeos.c
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/google/stout/Makefile.inc

@@ -22,6 +22,7 @@ smm-y += mainboard_smi.c
 smm-y += ec.c
 
 SRC_ROOT = $(src)/mainboard/google/stout
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/hp/2570p/Makefile.inc

@@ -13,6 +13,7 @@
 ## GNU General Public License for more details.
 ##
 
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/hp/2760p/Makefile.inc

@@ -13,6 +13,7 @@
 ## GNU General Public License for more details.
 ##
 
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/hp/8460p/Makefile.inc

@@ -13,6 +13,7 @@
 ## GNU General Public License for more details.
 ##
 
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/hp/8470p/Makefile.inc

@@ -13,6 +13,7 @@
 ## GNU General Public License for more details.
 ##
 
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/hp/8770w/Makefile.inc

@@ -13,4 +13,5 @@
 ## GNU General Public License for more details.
 ##
 
+bootblock-y += gpio.c
 romstage-y += gpio.c

src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc

@@ -1,2 +1,3 @@
+bootblock-y += gpio.c
 romstage-y += gpio.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/hp/folio_9470m/Makefile.inc

@@ -13,6 +13,7 @@
 ## GNU General Public License for more details.
 ##
 
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/hp/revolve_810_g1/Makefile.inc

@@ -13,6 +13,7 @@
 ## GNU General Public License for more details.
 ##
 
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/hp/z220_sff_workstation/Makefile.inc

@@ -1,2 +1,3 @@
+bootblock-y += gpio.c
 romstage-y += gpio.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/intel/dcp847ske/Makefile.inc

@@ -1,4 +1,5 @@
 romstage-y += early_southbridge.c
+bootblock-y += gpio.c
 romstage-y += gpio.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
 smm-y += smihandler.c

src/mainboard/intel/emeraldlake2/Makefile.inc

@@ -15,4 +15,5 @@
 
 romstage-y += chromeos.c
 ramstage-y += chromeos.c
+bootblock-y += gpio.c
 romstage-y += gpio.c

src/mainboard/kontron/ktqm77/Makefile.inc

@@ -1,3 +1,4 @@
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/lenovo/l520/Makefile.inc

@@ -14,6 +14,7 @@
 ##
 
 romstage-y += romstage.c
+bootblock-y += gpio.c
 romstage-y += gpio.c
 smm-y += smihandler.c
 

src/mainboard/lenovo/s230u/Makefile.inc

@@ -1,3 +1,4 @@
+bootblock-y += gpio.c
 romstage-y += gpio.c
 ramstage-y += ec.c
 smm-y += smihandler.c

src/mainboard/lenovo/t420/Makefile.inc

@@ -14,6 +14,7 @@
 ##
 
 smm-y += smihandler.c
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/lenovo/t420s/Makefile.inc

@@ -14,6 +14,7 @@
 ##
 
 smm-y += smihandler.c
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/lenovo/t430/Makefile.inc

@@ -1,4 +1,5 @@
 romstage-y += romstage.c
+bootblock-y += gpio.c
 romstage-y += gpio.c
 smm-y += smihandler.c
 

src/mainboard/lenovo/t430s/Makefile.inc

@@ -14,6 +14,7 @@
 ##
 
 smm-y += smihandler.c
+bootblock-y += variants/$(VARIANT_DIR)/gpio.c
 romstage-y += variants/$(VARIANT_DIR)/gpio.c
 romstage-y += variants/$(VARIANT_DIR)/romstage.c
 ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c

src/mainboard/lenovo/t520/Makefile.inc

@@ -14,6 +14,7 @@
 ##
 
 smm-y += smihandler.c
+bootblock-y += variants/$(VARIANT_DIR)/gpio.c
 romstage-y += variants/$(VARIANT_DIR)/gpio.c
 romstage-y += variants/$(VARIANT_DIR)/romstage.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/lenovo/t530/Makefile.inc

@@ -14,6 +14,7 @@
 ##
 
 smm-y += smihandler.c
+bootblock-y += variants/$(VARIANT_DIR)/gpio.c
 romstage-y += variants/$(VARIANT_DIR)/gpio.c
 romstage-y += variants/$(VARIANT_DIR)/romstage.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/lenovo/x131e/Makefile.inc

@@ -13,6 +13,7 @@
 ## GNU General Public License for more details.
 ##
 
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc

@@ -16,6 +16,7 @@
 subdirs-y += spd
 
 smm-y += smihandler.c
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/lenovo/x220/Makefile.inc

@@ -14,6 +14,7 @@
 ##
 
 smm-y += smihandler.c
+bootblock-y += variants/$(VARIANT_DIR)/gpio.c
 romstage-y += variants/$(VARIANT_DIR)/gpio.c
 romstage-y += variants/$(VARIANT_DIR)/romstage.c
 

src/mainboard/lenovo/x230/Makefile.inc

@@ -14,6 +14,7 @@
 ##
 
 smm-y += smihandler.c
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/msi/ms7707/Makefile.inc

@@ -1 +1,2 @@
+bootblock-y += gpio.c
 romstage-y += gpio.c

src/mainboard/roda/rv11/Makefile.inc

@@ -13,6 +13,7 @@
 ## GNU General Public License for more details.
 ##
 
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 romstage-y += variants/$(VARIANT_DIR)/romstage.c

src/mainboard/samsung/lumpy/Makefile.inc

@@ -27,6 +27,7 @@ $(SPD_BIN):
 cbfs-files-y += spd.bin
 spd.bin-file := $(SPD_BIN)
 spd.bin-type := spd
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/samsung/stumpy/Makefile.inc

@@ -15,6 +15,7 @@
 
 romstage-y += chromeos.c
 ramstage-y += chromeos.c
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

src/mainboard/sapphire/pureplatinumh61/Makefile.inc

@@ -14,6 +14,7 @@
 # GNU General Public License for more details.
 #
 
+bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads