Change in ...coreboot[master]: superio/*: Link early initialization into bootblock - coreboot-gerrit

4 Jan 2019

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30672
Change subject: superio/*: Link early initialization into bootblock
......................................................................
superio/*: Link early initialization into bootblock
This allows to set up the SuperIO in the C_ENVIRONMENT_BOOTBLOCK
bootblocks.
I ran the following command in the superio source directory:
for file in $(find -name Makefile.inc -exec grep -L bootblock {} ;)
do
    sed -i 's/(romstage)(.*)/bootblock\2\n&/' $file
done
Change-Id: I3d999611baa1e79c79fe6b1f01822ebaa5f85daf
Signed-off-by: Arthur Heymans arthur@aheymans.xyz
---
M src/superio/fintek/Makefile.inc
M src/superio/fintek/f81216h/Makefile.inc
M src/superio/intel/i8900/Makefile.inc
M src/superio/ite/Makefile.inc
M src/superio/ite/it8671f/Makefile.inc
M src/superio/ite/it8718f/Makefile.inc
M src/superio/ite/it8772f/Makefile.inc
M src/superio/nsc/pc87309/Makefile.inc
M src/superio/nsc/pc87360/Makefile.inc
M src/superio/nsc/pc87366/Makefile.inc
M src/superio/nsc/pc87417/Makefile.inc
M src/superio/nsc/pc97317/Makefile.inc
M src/superio/nuvoton/nct5104d/Makefile.inc
M src/superio/nuvoton/wpcm450/Makefile.inc
M src/superio/serverengines/pilot/Makefile.inc
M src/superio/smsc/dme1737/Makefile.inc
M src/superio/smsc/kbc1100/Makefile.inc
M src/superio/smsc/lpc47b272/Makefile.inc
M src/superio/smsc/lpc47b397/Makefile.inc
M src/superio/smsc/lpc47m10x/Makefile.inc
M src/superio/smsc/lpc47m15x/Makefile.inc
M src/superio/smsc/lpc47n207/Makefile.inc
M src/superio/smsc/lpc47n217/Makefile.inc
M src/superio/smsc/lpc47n227/Makefile.inc
M src/superio/smsc/sch4037/Makefile.inc
M src/superio/smsc/sio1007/Makefile.inc
M src/superio/smsc/sio1036/Makefile.inc
M src/superio/smsc/smscsuperio/Makefile.inc
M src/superio/winbond/Makefile.inc
M src/superio/winbond/w83627dhg/Makefile.inc
M src/superio/winbond/wpcd376i/Makefile.inc
31 files changed, 32 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/30672/1

diff --git a/src/superio/fintek/Makefile.inc b/src/superio/fintek/Makefile.inc
index 2222644..c346324 100644
--- a/src/superio/fintek/Makefile.inc
+++ b/src/superio/fintek/Makefile.inc
@@ -14,6 +14,7 @@
 ##
## include generic fintek pre-ram stage driver
+bootblock-$(CONFIG_SUPERIO_FINTEK_COMMON_ROMSTAGE) += common/early_serial.c
 romstage-$(CONFIG_SUPERIO_FINTEK_COMMON_ROMSTAGE) += common/early_serial.c
subdirs-y += f71805f
diff --git a/src/superio/fintek/f81216h/Makefile.inc b/src/superio/fintek/f81216h/Makefile.inc
index 51e5123..7dbf20e 100644
--- a/src/superio/fintek/f81216h/Makefile.inc
+++ b/src/superio/fintek/f81216h/Makefile.inc
@@ -14,5 +14,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_FINTEK_F81216H) += early_serial.c
 romstage-$(CONFIG_SUPERIO_FINTEK_F81216H) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_FINTEK_F81216H) += superio.c
diff --git a/src/superio/intel/i8900/Makefile.inc b/src/superio/intel/i8900/Makefile.inc
index fd1db21..562d5d1 100644
--- a/src/superio/intel/i8900/Makefile.inc
+++ b/src/superio/intel/i8900/Makefile.inc
@@ -14,5 +14,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_INTEL_I8900) += early_serial.c
 romstage-$(CONFIG_SUPERIO_INTEL_I8900) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_INTEL_I8900) += superio.c
diff --git a/src/superio/ite/Makefile.inc b/src/superio/ite/Makefile.inc
index 382dbd7..e2127c2 100644
--- a/src/superio/ite/Makefile.inc
+++ b/src/superio/ite/Makefile.inc
@@ -14,6 +14,7 @@
 ##
## include generic ite pre-ram stage driver
+bootblock-$(CONFIG_SUPERIO_ITE_COMMON_ROMSTAGE) += common/early_serial.c
 romstage-$(CONFIG_SUPERIO_ITE_COMMON_ROMSTAGE) += common/early_serial.c
## include generic ite environment controller driver
diff --git a/src/superio/ite/it8671f/Makefile.inc b/src/superio/ite/it8671f/Makefile.inc
index 339f962..f625bc1 100644
--- a/src/superio/ite/it8671f/Makefile.inc
+++ b/src/superio/ite/it8671f/Makefile.inc
@@ -14,5 +14,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_ITE_IT8671F) += early_serial.c
 romstage-$(CONFIG_SUPERIO_ITE_IT8671F) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_ITE_IT8671F) += superio.c
diff --git a/src/superio/ite/it8718f/Makefile.inc b/src/superio/ite/it8718f/Makefile.inc
index 7627d1c..89382ca 100644
--- a/src/superio/ite/it8718f/Makefile.inc
+++ b/src/superio/ite/it8718f/Makefile.inc
@@ -14,5 +14,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_ITE_IT8718F) += early_serial.c
 romstage-$(CONFIG_SUPERIO_ITE_IT8718F) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_ITE_IT8718F) += superio.c
diff --git a/src/superio/ite/it8772f/Makefile.inc b/src/superio/ite/it8772f/Makefile.inc
index a0bf94d..6c06c36 100644
--- a/src/superio/ite/it8772f/Makefile.inc
+++ b/src/superio/ite/it8772f/Makefile.inc
@@ -14,6 +14,7 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_ITE_IT8772F) += early_init.c
 romstage-$(CONFIG_SUPERIO_ITE_IT8772F) += early_init.c
 ramstage-$(CONFIG_SUPERIO_ITE_IT8772F) += superio.c
 smm-$(CONFIG_SUPERIO_ITE_IT8772F) += early_init.c
diff --git a/src/superio/nsc/pc87309/Makefile.inc b/src/superio/nsc/pc87309/Makefile.inc
index e04c4f8..0f0b367 100644
--- a/src/superio/nsc/pc87309/Makefile.inc
+++ b/src/superio/nsc/pc87309/Makefile.inc
@@ -14,5 +14,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_NSC_PC87309) += early_serial.c
 romstage-$(CONFIG_SUPERIO_NSC_PC87309) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_NSC_PC87309) += superio.c
diff --git a/src/superio/nsc/pc87360/Makefile.inc b/src/superio/nsc/pc87360/Makefile.inc
index 5c3ed24..e0ee98a 100644
--- a/src/superio/nsc/pc87360/Makefile.inc
+++ b/src/superio/nsc/pc87360/Makefile.inc
@@ -15,5 +15,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_NSC_PC87360) += early_serial.c
 romstage-$(CONFIG_SUPERIO_NSC_PC87360) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_NSC_PC87360) += superio.c
diff --git a/src/superio/nsc/pc87366/Makefile.inc b/src/superio/nsc/pc87366/Makefile.inc
index a7b5536..6e558ac 100644
--- a/src/superio/nsc/pc87366/Makefile.inc
+++ b/src/superio/nsc/pc87366/Makefile.inc
@@ -15,5 +15,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_NSC_PC87366) += early_serial.c
 romstage-$(CONFIG_SUPERIO_NSC_PC87366) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_NSC_PC87366) += superio.c
diff --git a/src/superio/nsc/pc87417/Makefile.inc b/src/superio/nsc/pc87417/Makefile.inc
index a4a0ed5..4294561 100644
--- a/src/superio/nsc/pc87417/Makefile.inc
+++ b/src/superio/nsc/pc87417/Makefile.inc
@@ -16,6 +16,8 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_NSC_PC87417) += early_init.c
 romstage-$(CONFIG_SUPERIO_NSC_PC87417) += early_init.c
+bootblock-$(CONFIG_SUPERIO_NSC_PC87417) += early_serial.c
 romstage-$(CONFIG_SUPERIO_NSC_PC87417) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_NSC_PC87417) += superio.c
diff --git a/src/superio/nsc/pc97317/Makefile.inc b/src/superio/nsc/pc97317/Makefile.inc
index f5f1300..2f8ee76 100644
--- a/src/superio/nsc/pc97317/Makefile.inc
+++ b/src/superio/nsc/pc97317/Makefile.inc
@@ -14,5 +14,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_NSC_PC97317) += early_serial.c
 romstage-$(CONFIG_SUPERIO_NSC_PC97317) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_NSC_PC97317) += superio.c
diff --git a/src/superio/nuvoton/nct5104d/Makefile.inc b/src/superio/nuvoton/nct5104d/Makefile.inc
index 5067a93..1c67660 100644
--- a/src/superio/nuvoton/nct5104d/Makefile.inc
+++ b/src/superio/nuvoton/nct5104d/Makefile.inc
@@ -15,4 +15,5 @@
 ##
ramstage-$(CONFIG_SUPERIO_NUVOTON_NCT5104D) += superio.c
+bootblock-$(CONFIG_SUPERIO_NUVOTON_NCT5104D) += early_init.c
 romstage-$(CONFIG_SUPERIO_NUVOTON_NCT5104D) += early_init.c
diff --git a/src/superio/nuvoton/wpcm450/Makefile.inc b/src/superio/nuvoton/wpcm450/Makefile.inc
index e5aa66b..27dc253 100644
--- a/src/superio/nuvoton/wpcm450/Makefile.inc
+++ b/src/superio/nuvoton/wpcm450/Makefile.inc
@@ -14,5 +14,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_NUVOTON_WPCM450) += early_init.c
 romstage-$(CONFIG_SUPERIO_NUVOTON_WPCM450) += early_init.c
 ramstage-$(CONFIG_SUPERIO_NUVOTON_WPCM450) += superio.c
diff --git a/src/superio/serverengines/pilot/Makefile.inc b/src/superio/serverengines/pilot/Makefile.inc
index e342b5f..26ff103 100644
--- a/src/superio/serverengines/pilot/Makefile.inc
+++ b/src/superio/serverengines/pilot/Makefile.inc
@@ -14,5 +14,5 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_SERVERENGINES_PILOT) += early_init.c
 romstage-$(CONFIG_SUPERIO_SERVERENGINES_PILOT) += early_init.c
-romstage-$(CONFIG_SUPERIO_SERVERENGINES_PILOT) += early_serial.c
diff --git a/src/superio/smsc/dme1737/Makefile.inc b/src/superio/smsc/dme1737/Makefile.inc
index 17f10b1..e106a02 100644
--- a/src/superio/smsc/dme1737/Makefile.inc
+++ b/src/superio/smsc/dme1737/Makefile.inc
@@ -16,5 +16,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_SMSC_DME1737) += early_serial.c
 romstage-$(CONFIG_SUPERIO_SMSC_DME1737) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_SMSC_DME1737) += superio.c
diff --git a/src/superio/smsc/kbc1100/Makefile.inc b/src/superio/smsc/kbc1100/Makefile.inc
index 3a22a2e..5da9494 100644
--- a/src/superio/smsc/kbc1100/Makefile.inc
+++ b/src/superio/smsc/kbc1100/Makefile.inc
@@ -13,5 +13,6 @@
 # GNU General Public License for more details.
 #
+bootblock-$(CONFIG_SUPERIO_SMSC_KBC1100) += early_init.c
 romstage-$(CONFIG_SUPERIO_SMSC_KBC1100) += early_init.c
 ramstage-$(CONFIG_SUPERIO_SMSC_KBC1100) += superio.c
diff --git a/src/superio/smsc/lpc47b272/Makefile.inc b/src/superio/smsc/lpc47b272/Makefile.inc
index 904a70a..51d77d4 100644
--- a/src/superio/smsc/lpc47b272/Makefile.inc
+++ b/src/superio/smsc/lpc47b272/Makefile.inc
@@ -14,5 +14,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_SMSC_LPC47B272) += early_serial.c
 romstage-$(CONFIG_SUPERIO_SMSC_LPC47B272) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_SMSC_LPC47B272) += superio.c
diff --git a/src/superio/smsc/lpc47b397/Makefile.inc b/src/superio/smsc/lpc47b397/Makefile.inc
index 8609ee0..ddb251d 100644
--- a/src/superio/smsc/lpc47b397/Makefile.inc
+++ b/src/superio/smsc/lpc47b397/Makefile.inc
@@ -16,5 +16,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_SMSC_LPC47B397) += early_serial.c
 romstage-$(CONFIG_SUPERIO_SMSC_LPC47B397) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_SMSC_LPC47B397) += superio.c
diff --git a/src/superio/smsc/lpc47m10x/Makefile.inc b/src/superio/smsc/lpc47m10x/Makefile.inc
index 0dd272c..278aa1e 100644
--- a/src/superio/smsc/lpc47m10x/Makefile.inc
+++ b/src/superio/smsc/lpc47m10x/Makefile.inc
@@ -18,5 +18,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_SMSC_LPC47M10X) += early_serial.c
 romstage-$(CONFIG_SUPERIO_SMSC_LPC47M10X) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_SMSC_LPC47M10X) += superio.c
diff --git a/src/superio/smsc/lpc47m15x/Makefile.inc b/src/superio/smsc/lpc47m15x/Makefile.inc
index f465669..dc6b9ab 100644
--- a/src/superio/smsc/lpc47m15x/Makefile.inc
+++ b/src/superio/smsc/lpc47m15x/Makefile.inc
@@ -13,5 +13,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_SMSC_LPC47M15X) += early_serial.c
 romstage-$(CONFIG_SUPERIO_SMSC_LPC47M15X) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_SMSC_LPC47M15X) += superio.c
diff --git a/src/superio/smsc/lpc47n207/Makefile.inc b/src/superio/smsc/lpc47n207/Makefile.inc
index 599e19a..65a0939 100644
--- a/src/superio/smsc/lpc47n207/Makefile.inc
+++ b/src/superio/smsc/lpc47n207/Makefile.inc
@@ -14,4 +14,5 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_SMSC_LPC47N207) += early_serial.c
 romstage-$(CONFIG_SUPERIO_SMSC_LPC47N207) += early_serial.c
diff --git a/src/superio/smsc/lpc47n217/Makefile.inc b/src/superio/smsc/lpc47n217/Makefile.inc
index 0bff637..a643407 100644
--- a/src/superio/smsc/lpc47n217/Makefile.inc
+++ b/src/superio/smsc/lpc47n217/Makefile.inc
@@ -14,5 +14,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_SMSC_LPC47N217) += early_serial.c
 romstage-$(CONFIG_SUPERIO_SMSC_LPC47N217) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_SMSC_LPC47N217) += superio.c
diff --git a/src/superio/smsc/lpc47n227/Makefile.inc b/src/superio/smsc/lpc47n227/Makefile.inc
index 71abe9e..4bb0dac 100644
--- a/src/superio/smsc/lpc47n227/Makefile.inc
+++ b/src/superio/smsc/lpc47n227/Makefile.inc
@@ -13,5 +13,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_SMSC_LPC47N227) += early_serial.c
 romstage-$(CONFIG_SUPERIO_SMSC_LPC47N227) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_SMSC_LPC47N227) += superio.c
diff --git a/src/superio/smsc/sch4037/Makefile.inc b/src/superio/smsc/sch4037/Makefile.inc
index 6b3bf19..ac7d7de 100644
--- a/src/superio/smsc/sch4037/Makefile.inc
+++ b/src/superio/smsc/sch4037/Makefile.inc
@@ -13,5 +13,6 @@
 # GNU General Public License for more details.
 #
+bootblock-$(CONFIG_SUPERIO_SMSC_SCH4037) += sch4037_early_init.c
 romstage-$(CONFIG_SUPERIO_SMSC_SCH4037) += sch4037_early_init.c
 ramstage-$(CONFIG_SUPERIO_SMSC_SCH4037) += superio.c
diff --git a/src/superio/smsc/sio1007/Makefile.inc b/src/superio/smsc/sio1007/Makefile.inc
index bc458bf..20a0b2a 100644
--- a/src/superio/smsc/sio1007/Makefile.inc
+++ b/src/superio/smsc/sio1007/Makefile.inc
@@ -13,4 +13,5 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_SMSC_SIO1007) += early_serial.c
 romstage-$(CONFIG_SUPERIO_SMSC_SIO1007) += early_serial.c
diff --git a/src/superio/smsc/sio1036/Makefile.inc b/src/superio/smsc/sio1036/Makefile.inc
index 7d09b69..e9fdae2 100644
--- a/src/superio/smsc/sio1036/Makefile.inc
+++ b/src/superio/smsc/sio1036/Makefile.inc
@@ -13,5 +13,6 @@
 # GNU General Public License for more details.
 #
+bootblock-$(CONFIG_SUPERIO_SMSC_SIO1036) += sio1036_early_init.c
 romstage-$(CONFIG_SUPERIO_SMSC_SIO1036) += sio1036_early_init.c
 ramstage-$(CONFIG_SUPERIO_SMSC_SIO1036) += superio.c
diff --git a/src/superio/smsc/smscsuperio/Makefile.inc b/src/superio/smsc/smscsuperio/Makefile.inc
index aae5f22..b9bf35c 100644
--- a/src/superio/smsc/smscsuperio/Makefile.inc
+++ b/src/superio/smsc/smscsuperio/Makefile.inc
@@ -14,5 +14,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_SMSC_SMSCSUPERIO) += early_serial.c
 romstage-$(CONFIG_SUPERIO_SMSC_SMSCSUPERIO) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_SMSC_SMSCSUPERIO) += superio.c
diff --git a/src/superio/winbond/Makefile.inc b/src/superio/winbond/Makefile.inc
index b0b7b8c..a98c366 100644
--- a/src/superio/winbond/Makefile.inc
+++ b/src/superio/winbond/Makefile.inc
@@ -14,6 +14,7 @@
 ##
## include generic winbond pre-ram stage driver
+bootblock-$(CONFIG_SUPERIO_WINBOND_COMMON_ROMSTAGE) += common/early_init.c
 romstage-$(CONFIG_SUPERIO_WINBOND_COMMON_ROMSTAGE) += common/early_init.c
subdirs-y += w83627dhg
diff --git a/src/superio/winbond/w83627dhg/Makefile.inc b/src/superio/winbond/w83627dhg/Makefile.inc
index 7d9dc97..4075a41 100644
--- a/src/superio/winbond/w83627dhg/Makefile.inc
+++ b/src/superio/winbond/w83627dhg/Makefile.inc
@@ -15,5 +15,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_WINBOND_W83627DHG) += early_serial.c
 romstage-$(CONFIG_SUPERIO_WINBOND_W83627DHG) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_WINBOND_W83627DHG) += superio.c
diff --git a/src/superio/winbond/wpcd376i/Makefile.inc b/src/superio/winbond/wpcd376i/Makefile.inc
index 402aa32..cebd175 100644
--- a/src/superio/winbond/wpcd376i/Makefile.inc
+++ b/src/superio/winbond/wpcd376i/Makefile.inc
@@ -15,5 +15,6 @@
 ## GNU General Public License for more details.
 ##
+bootblock-$(CONFIG_SUPERIO_WINBOND_WPCD376I) += early_serial.c
 romstage-$(CONFIG_SUPERIO_WINBOND_WPCD376I) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_WINBOND_WPCD376I) += superio.c
-- 
To view, visit https://review.coreboot.org/c/coreboot/+/30672
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

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



    