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>

11 files changed, 15 insertions, 15 deletions

diff --git a/src/superio/nuvoton/Makefile.inc b/src/superio/nuvoton/Makefile.inc
index 0a4b357a20..de4e99cb67 100644
--- a/src/superio/nuvoton/Makefile.inc
+++ b/src/superio/nuvoton/Makefile.inc
@@ -14,10 +14,8 @@
 ##
 
 ## include generic nuvoton pre-ram stage driver
-ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y)
-bootblock-$(CONFIG_SUPERIO_NUVOTON_COMMON_ROMSTAGE) += common/early_serial.c
-endif
-romstage-$(CONFIG_SUPERIO_NUVOTON_COMMON_ROMSTAGE) += common/early_serial.c
+bootblock-$(CONFIG_SUPERIO_NUVOTON_COMMON_PRE_RAM) += common/early_serial.c
+romstage-$(CONFIG_SUPERIO_NUVOTON_COMMON_PRE_RAM) += common/early_serial.c
 
 subdirs-$(CONFIG_SUPERIO_NUVOTON_WPCM450) += wpcm450
 subdirs-$(CONFIG_SUPERIO_NUVOTON_NCT5104D) += nct5104d
diff --git a/src/superio/nuvoton/common/Kconfig b/src/superio/nuvoton/common/Kconfig
index 869f1fe955..0af671f512 100644
--- a/src/superio/nuvoton/common/Kconfig
+++ b/src/superio/nuvoton/common/Kconfig
@@ -14,6 +14,6 @@
 ##
 
 # Generic Nuvoton romstage driver - Just enough UART initialisation code for
-# romstage.
-config SUPERIO_NUVOTON_COMMON_ROMSTAGE
+# pre-ram.
+config SUPERIO_NUVOTON_COMMON_PRE_RAM
 	bool
diff --git a/src/superio/nuvoton/common/nuvoton.h b/src/superio/nuvoton/common/nuvoton.h
index 614b039be5..4cb2b6f48e 100644
--- a/src/superio/nuvoton/common/nuvoton.h
+++ b/src/superio/nuvoton/common/nuvoton.h
@@ -15,8 +15,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef SUPERIO_NUVOTON_COMMON_ROMSTAGE_H
-#define SUPERIO_NUVOTON_COMMON_ROMSTAGE_H
+#ifndef SUPERIO_NUVOTON_COMMON_PRE_RAM_H
+#define SUPERIO_NUVOTON_COMMON_PRE_RAM_H
 
 #include <arch/io.h>
 #include <stdint.h>
@@ -25,4 +25,4 @@ void nuvoton_pnp_enter_conf_state(pnp_devfn_t dev);
 void nuvoton_pnp_exit_conf_state(pnp_devfn_t dev);
 void nuvoton_enable_serial(pnp_devfn_t dev, u16 iobase);
 
-#endif /* SUPERIO_NUVOTON_COMMON_ROMSTAGE_H */
+#endif /* SUPERIO_NUVOTON_COMMON_PRE_RAM_H */
diff --git a/src/superio/nuvoton/nct5104d/Kconfig b/src/superio/nuvoton/nct5104d/Kconfig
index 86fba7601d..12ef644f7b 100644
--- a/src/superio/nuvoton/nct5104d/Kconfig
+++ b/src/superio/nuvoton/nct5104d/Kconfig
@@ -15,4 +15,4 @@
 
 config SUPERIO_NUVOTON_NCT5104D
 	bool
-	select SUPERIO_NUVOTON_COMMON_ROMSTAGE
+	select SUPERIO_NUVOTON_COMMON_PRE_RAM
diff --git a/src/superio/nuvoton/nct5104d/Makefile.inc b/src/superio/nuvoton/nct5104d/Makefile.inc
index 5067a93915..1c67660736 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/nct5572d/Kconfig b/src/superio/nuvoton/nct5572d/Kconfig
index b666174bad..66d8027e8f 100644
--- a/src/superio/nuvoton/nct5572d/Kconfig
+++ b/src/superio/nuvoton/nct5572d/Kconfig
@@ -15,4 +15,4 @@
 
 config SUPERIO_NUVOTON_NCT5572D
 	bool
-	select SUPERIO_NUVOTON_COMMON_ROMSTAGE
+	select SUPERIO_NUVOTON_COMMON_PRE_RAM
diff --git a/src/superio/nuvoton/nct6776/Kconfig b/src/superio/nuvoton/nct6776/Kconfig
index cf0fe21b78..90d4d32555 100644
--- a/src/superio/nuvoton/nct6776/Kconfig
+++ b/src/superio/nuvoton/nct6776/Kconfig
@@ -16,7 +16,7 @@
 
 config SUPERIO_NUVOTON_NCT6776
 	bool
-	select SUPERIO_NUVOTON_COMMON_ROMSTAGE
+	select SUPERIO_NUVOTON_COMMON_PRE_RAM
 
 config SUPERIO_NUVOTON_NCT6776_COM_A
 	bool
diff --git a/src/superio/nuvoton/nct6779d/Kconfig b/src/superio/nuvoton/nct6779d/Kconfig
index 1b7affeaea..aad9eb4d2a 100644
--- a/src/superio/nuvoton/nct6779d/Kconfig
+++ b/src/superio/nuvoton/nct6779d/Kconfig
@@ -15,4 +15,4 @@
 
 config SUPERIO_NUVOTON_NCT6779D
 	bool
-	select SUPERIO_NUVOTON_COMMON_ROMSTAGE
+	select SUPERIO_NUVOTON_COMMON_PRE_RAM
diff --git a/src/superio/nuvoton/nct6791d/Kconfig b/src/superio/nuvoton/nct6791d/Kconfig
index 80e39b2ec2..6e39e462aa 100644
--- a/src/superio/nuvoton/nct6791d/Kconfig
+++ b/src/superio/nuvoton/nct6791d/Kconfig
@@ -15,4 +15,4 @@
 
 config SUPERIO_NUVOTON_NCT6791D
 	bool
-	select SUPERIO_NUVOTON_COMMON_ROMSTAGE
+	select SUPERIO_NUVOTON_COMMON_PRE_RAM
diff --git a/src/superio/nuvoton/npcd378/Kconfig b/src/superio/nuvoton/npcd378/Kconfig
index d405e29ad7..d72c751d61 100644
--- a/src/superio/nuvoton/npcd378/Kconfig
+++ b/src/superio/nuvoton/npcd378/Kconfig
@@ -15,4 +15,4 @@
 
 config SUPERIO_NUVOTON_NPCD378
 	bool
-	select SUPERIO_NUVOTON_COMMON_ROMSTAGE
+	select SUPERIO_NUVOTON_COMMON_PRE_RAM
diff --git a/src/superio/nuvoton/wpcm450/Makefile.inc b/src/superio/nuvoton/wpcm450/Makefile.inc
index e5aa66bb02..27dc253e80 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