superio/*: Link early initialization into bootblock

This allows to set up the SuperIO in the C_ENVIRONMENT_BOOTBLOCK
bootblocks. It is likely unnecessary to do this in verstage.

This also renames COMMON_ROMSTAGE to COMMON_PRE_RAM.

Change-Id: I3d999611baa1e79c79fe6b1f01822ebaa5f85daf
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/30672
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>

12 files changed, 15 insertions, 13 deletions

diff --git a/src/superio/fintek/Makefile.inc b/src/superio/fintek/Makefile.inc
index 2222644084..796e5194d1 100644
--- a/src/superio/fintek/Makefile.inc
+++ b/src/superio/fintek/Makefile.inc
@@ -14,7 +14,8 @@
 ##
 
 ## include generic fintek pre-ram stage driver
-romstage-$(CONFIG_SUPERIO_FINTEK_COMMON_ROMSTAGE) += common/early_serial.c
+bootblock-$(CONFIG_SUPERIO_FINTEK_COMMON_PRE_RAM) += common/early_serial.c
+romstage-$(CONFIG_SUPERIO_FINTEK_COMMON_PRE_RAM) += common/early_serial.c
 
 subdirs-y += f71805f
 subdirs-y += f71808a
diff --git a/src/superio/fintek/common/Kconfig b/src/superio/fintek/common/Kconfig
index c9e73e5e89..22fe82bd2a 100644
--- a/src/superio/fintek/common/Kconfig
+++ b/src/superio/fintek/common/Kconfig
@@ -16,5 +16,5 @@
 
 # Generic Fintek romstage driver - Just enough UART initialisation code for
 # romstage.
-config SUPERIO_FINTEK_COMMON_ROMSTAGE
+config SUPERIO_FINTEK_COMMON_PRE_RAM
 	bool
diff --git a/src/superio/fintek/common/fintek.h b/src/superio/fintek/common/fintek.h
index e083278e8e..7ad08ea30a 100644
--- a/src/superio/fintek/common/fintek.h
+++ b/src/superio/fintek/common/fintek.h
@@ -14,12 +14,12 @@
  * GNU General Public License for more details.
  */
 
-#ifndef SUPERIO_FINTEK_COMMON_ROMSTAGE_H
-#define SUPERIO_FINTEK_COMMON_ROMSTAGE_H
+#ifndef SUPERIO_FINTEK_COMMON_PRE_RAM_H
+#define SUPERIO_FINTEK_COMMON_PRE_RAM_H
 
 #include <arch/io.h>
 #include <stdint.h>
 
 void fintek_enable_serial(pnp_devfn_t dev, u16 iobase);
 
-#endif /* SUPERIO_FINTEK_COMMON_ROMSTAGE_H */
+#endif /* SUPERIO_FINTEK_COMMON_PRE_RAM_H */
diff --git a/src/superio/fintek/f71805f/Kconfig b/src/superio/fintek/f71805f/Kconfig
index ef717f10c4..7f06f55128 100644
--- a/src/superio/fintek/f71805f/Kconfig
+++ b/src/superio/fintek/f71805f/Kconfig
@@ -16,4 +16,4 @@
 
 config SUPERIO_FINTEK_F71805F
 	bool
-	select SUPERIO_FINTEK_COMMON_ROMSTAGE
+	select SUPERIO_FINTEK_COMMON_PRE_RAM
diff --git a/src/superio/fintek/f71808a/Kconfig b/src/superio/fintek/f71808a/Kconfig
index 756f28d22b..1fb9a49fba 100644
--- a/src/superio/fintek/f71808a/Kconfig
+++ b/src/superio/fintek/f71808a/Kconfig
@@ -15,4 +15,4 @@
 
 config SUPERIO_FINTEK_F71808A
 	bool
-	select SUPERIO_FINTEK_COMMON_ROMSTAGE
+	select SUPERIO_FINTEK_COMMON_PRE_RAM
diff --git a/src/superio/fintek/f71859/Kconfig b/src/superio/fintek/f71859/Kconfig
index cab87966a2..eaeefd949a 100644
--- a/src/superio/fintek/f71859/Kconfig
+++ b/src/superio/fintek/f71859/Kconfig
@@ -16,4 +16,4 @@
 
 config SUPERIO_FINTEK_F71859
 	bool
-	select SUPERIO_FINTEK_COMMON_ROMSTAGE
+	select SUPERIO_FINTEK_COMMON_PRE_RAM
diff --git a/src/superio/fintek/f71863fg/Kconfig b/src/superio/fintek/f71863fg/Kconfig
index fca5972e60..a1def52a12 100644
--- a/src/superio/fintek/f71863fg/Kconfig
+++ b/src/superio/fintek/f71863fg/Kconfig
@@ -16,4 +16,4 @@
 
 config SUPERIO_FINTEK_F71863FG
 	bool
-	select SUPERIO_FINTEK_COMMON_ROMSTAGE
+	select SUPERIO_FINTEK_COMMON_PRE_RAM
diff --git a/src/superio/fintek/f71869ad/Kconfig b/src/superio/fintek/f71869ad/Kconfig
index b6549cdf70..550af5ad76 100644
--- a/src/superio/fintek/f71869ad/Kconfig
+++ b/src/superio/fintek/f71869ad/Kconfig
@@ -16,4 +16,4 @@
 
 config SUPERIO_FINTEK_F71869AD
 	bool
-	select SUPERIO_FINTEK_COMMON_ROMSTAGE
+	select SUPERIO_FINTEK_COMMON_PRE_RAM
diff --git a/src/superio/fintek/f71872/Kconfig b/src/superio/fintek/f71872/Kconfig
index 10e7c21456..516ff0944d 100644
--- a/src/superio/fintek/f71872/Kconfig
+++ b/src/superio/fintek/f71872/Kconfig
@@ -16,4 +16,4 @@
 
 config SUPERIO_FINTEK_F71872
 	bool
-	select SUPERIO_FINTEK_COMMON_ROMSTAGE
+	select SUPERIO_FINTEK_COMMON_PRE_RAM
diff --git a/src/superio/fintek/f81216h/Makefile.inc b/src/superio/fintek/f81216h/Makefile.inc
index 51e51237fb..7dbf20e8cf 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/fintek/f81865f/Kconfig b/src/superio/fintek/f81865f/Kconfig
index 27dbf7b39f..84eca4d272 100644
--- a/src/superio/fintek/f81865f/Kconfig
+++ b/src/superio/fintek/f81865f/Kconfig
@@ -16,4 +16,4 @@
 
 config SUPERIO_FINTEK_F81865F
 	bool
-	select SUPERIO_FINTEK_COMMON_ROMSTAGE
+	select SUPERIO_FINTEK_COMMON_PRE_RAM
diff --git a/src/superio/fintek/f81866d/Kconfig b/src/superio/fintek/f81866d/Kconfig
index e89a0eb565..ffe9b762e2 100644
--- a/src/superio/fintek/f81866d/Kconfig
+++ b/src/superio/fintek/f81866d/Kconfig
@@ -16,4 +16,4 @@
 
 config SUPERIO_FINTEK_F81866D
 	bool
-	select SUPERIO_FINTEK_COMMON_ROMSTAGE
+	select SUPERIO_FINTEK_COMMON_PRE_RAM