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>

16 files changed, 20 insertions, 16 deletions

diff --git a/src/superio/ite/Makefile.inc b/src/superio/ite/Makefile.inc
index 382dbd7310f5..e73fd713b281 100644
--- a/src/superio/ite/Makefile.inc
+++ b/src/superio/ite/Makefile.inc
@@ -14,7 +14,8 @@
 ##
 
 ## include generic ite pre-ram stage driver
-romstage-$(CONFIG_SUPERIO_ITE_COMMON_ROMSTAGE) += common/early_serial.c
+bootblock-$(CONFIG_SUPERIO_ITE_COMMON_PRE_RAM) += common/early_serial.c
+romstage-$(CONFIG_SUPERIO_ITE_COMMON_PRE_RAM) += common/early_serial.c
 
 ## include generic ite environment controller driver
 ramstage-$(CONFIG_SUPERIO_ITE_ENV_CTRL) += common/env_ctrl.c
diff --git a/src/superio/ite/common/Kconfig b/src/superio/ite/common/Kconfig
index 162b7f15454a..8e52cf4e4e15 100644
--- a/src/superio/ite/common/Kconfig
+++ b/src/superio/ite/common/Kconfig
@@ -17,7 +17,7 @@
 
 # Generic ITE romstage driver - Just enough UART initialisation code for
 # romstage.
-config SUPERIO_ITE_COMMON_ROMSTAGE
+config SUPERIO_ITE_COMMON_PRE_RAM
 	bool
 
 # Generic ITE environment controller driver
diff --git a/src/superio/ite/common/ite.h b/src/superio/ite/common/ite.h
index 7e0e80ec96fc..5b39672a5f59 100644
--- a/src/superio/ite/common/ite.h
+++ b/src/superio/ite/common/ite.h
@@ -14,8 +14,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef SUPERIO_ITE_COMMON_ROMSTAGE_H
-#define SUPERIO_ITE_COMMON_ROMSTAGE_H
+#ifndef SUPERIO_ITE_COMMON_PRE_RAM_H
+#define SUPERIO_ITE_COMMON_PRE_RAM_H
 
 #include <arch/io.h>
 #include <stdint.h>
@@ -34,4 +34,4 @@ void ite_kill_watchdog(pnp_devfn_t dev);
 void pnp_enter_conf_state(pnp_devfn_t dev);
 void pnp_exit_conf_state(pnp_devfn_t dev);
 
-#endif /* SUPERIO_ITE_COMMON_ROMSTAGE_H */
+#endif /* SUPERIO_ITE_COMMON_PRE_RAM_H */
diff --git a/src/superio/ite/it8623e/Kconfig b/src/superio/ite/it8623e/Kconfig
index 274959e2befb..756c7ff71daa 100644
--- a/src/superio/ite/it8623e/Kconfig
+++ b/src/superio/ite/it8623e/Kconfig
@@ -18,7 +18,7 @@
 
 config SUPERIO_ITE_IT8623E
 	bool
-	select SUPERIO_ITE_COMMON_ROMSTAGE
+	select SUPERIO_ITE_COMMON_PRE_RAM
 	select SUPERIO_ITE_ENV_CTRL
 	select SUPERIO_ITE_ENV_CTRL_PWM_FREQ2
 	select SUPERIO_ITE_ENV_CTRL_FAN16_CONFIG
diff --git a/src/superio/ite/it8671f/Kconfig b/src/superio/ite/it8671f/Kconfig
index 4ec94ce14278..ba632243af92 100644
--- a/src/superio/ite/it8671f/Kconfig
+++ b/src/superio/ite/it8671f/Kconfig
@@ -16,4 +16,4 @@
 
 config SUPERIO_ITE_IT8671F
 	bool
-	select SUPERIO_ITE_COMMON_ROMSTAGE
+	select SUPERIO_ITE_COMMON_PRE_RAM
diff --git a/src/superio/ite/it8671f/Makefile.inc b/src/superio/ite/it8671f/Makefile.inc
index 339f9627ca63..f625bc19a653 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/it8712f/Kconfig b/src/superio/ite/it8712f/Kconfig
index 226c9136453f..3c43c7ed731a 100644
--- a/src/superio/ite/it8712f/Kconfig
+++ b/src/superio/ite/it8712f/Kconfig
@@ -16,4 +16,4 @@
 
 config SUPERIO_ITE_IT8712F
 	bool
-	select SUPERIO_ITE_COMMON_ROMSTAGE
+	select SUPERIO_ITE_COMMON_PRE_RAM
diff --git a/src/superio/ite/it8716f/Kconfig b/src/superio/ite/it8716f/Kconfig
index 6b0b79d86497..969e7882d964 100644
--- a/src/superio/ite/it8716f/Kconfig
+++ b/src/superio/ite/it8716f/Kconfig
@@ -16,10 +16,10 @@
 
 config SUPERIO_ITE_IT8716F
 	bool
-	select SUPERIO_ITE_COMMON_ROMSTAGE
+	select SUPERIO_ITE_COMMON_PRE_RAM
 
 config SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL
 	bool
 	depends on SUPERIO_ITE_IT8716F
 	default n
-	select SUPERIO_ITE_COMMON_ROMSTAGE
+	select SUPERIO_ITE_COMMON_PRE_RAM
diff --git a/src/superio/ite/it8718f/Kconfig b/src/superio/ite/it8718f/Kconfig
index 3201195ec13b..848d71d913d8 100644
--- a/src/superio/ite/it8718f/Kconfig
+++ b/src/superio/ite/it8718f/Kconfig
@@ -16,7 +16,7 @@
 
 config SUPERIO_ITE_IT8718F
 	bool
-	select SUPERIO_ITE_COMMON_ROMSTAGE
+	select SUPERIO_ITE_COMMON_PRE_RAM
 	select SUPERIO_ITE_ENV_CTRL
 	select SUPERIO_ITE_ENV_CTRL_FAN16_CONFIG
 	select SUPERIO_ITE_ENV_CTRL_PWM_FREQ2
diff --git a/src/superio/ite/it8718f/Makefile.inc b/src/superio/ite/it8718f/Makefile.inc
index 7627d1c740ac..89382caa30c6 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/it8720f/Kconfig b/src/superio/ite/it8720f/Kconfig
index da42e0b87dd7..b8b9262500f3 100644
--- a/src/superio/ite/it8720f/Kconfig
+++ b/src/superio/ite/it8720f/Kconfig
@@ -17,7 +17,7 @@
 
 config SUPERIO_ITE_IT8720F
 	bool
-	select SUPERIO_ITE_COMMON_ROMSTAGE
+	select SUPERIO_ITE_COMMON_PRE_RAM
 	select SUPERIO_ITE_ENV_CTRL
 	select SUPERIO_ITE_ENV_CTRL_FAN16_CONFIG
 	select SUPERIO_ITE_ENV_CTRL_PWM_FREQ2
diff --git a/src/superio/ite/it8721f/Kconfig b/src/superio/ite/it8721f/Kconfig
index 266dfdf1bd70..cf01242d315d 100644
--- a/src/superio/ite/it8721f/Kconfig
+++ b/src/superio/ite/it8721f/Kconfig
@@ -16,4 +16,4 @@
 
 config SUPERIO_ITE_IT8721F
 	bool
-	select SUPERIO_ITE_COMMON_ROMSTAGE
+	select SUPERIO_ITE_COMMON_PRE_RAM
diff --git a/src/superio/ite/it8728f/Kconfig b/src/superio/ite/it8728f/Kconfig
index 90c3b509af2b..40a2f49529df 100644
--- a/src/superio/ite/it8728f/Kconfig
+++ b/src/superio/ite/it8728f/Kconfig
@@ -16,7 +16,7 @@
 
 config SUPERIO_ITE_IT8728F
 	bool
-	select SUPERIO_ITE_COMMON_ROMSTAGE
+	select SUPERIO_ITE_COMMON_PRE_RAM
 	select SUPERIO_ITE_ENV_CTRL
 	select SUPERIO_ITE_ENV_CTRL_PWM_FREQ2
 	select SUPERIO_ITE_ENV_CTRL_FAN16_CONFIG
diff --git a/src/superio/ite/it8772f/Kconfig b/src/superio/ite/it8772f/Kconfig
index 72c79ce714d3..ad6ba08350c4 100644
--- a/src/superio/ite/it8772f/Kconfig
+++ b/src/superio/ite/it8772f/Kconfig
@@ -16,4 +16,4 @@
 
 config SUPERIO_ITE_IT8772F
 	bool
-	select SUPERIO_ITE_COMMON_ROMSTAGE
+	select SUPERIO_ITE_COMMON_PRE_RAM
diff --git a/src/superio/ite/it8772f/Makefile.inc b/src/superio/ite/it8772f/Makefile.inc
index a0bf94db7500..6c06c3674080 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/ite/it8783ef/Kconfig b/src/superio/ite/it8783ef/Kconfig
index 5cae0714296e..0e1f6c3ddd2c 100644
--- a/src/superio/ite/it8783ef/Kconfig
+++ b/src/superio/ite/it8783ef/Kconfig
@@ -15,7 +15,7 @@
 
 config SUPERIO_ITE_IT8783EF
 	bool
-	select SUPERIO_ITE_COMMON_ROMSTAGE
+	select SUPERIO_ITE_COMMON_PRE_RAM
 	select SUPERIO_ITE_ENV_CTRL
 	select SUPERIO_ITE_ENV_CTRL_FAN16_CONFIG
 	select SUPERIO_ITE_ENV_CTRL_PWM_FREQ2