diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2019-01-04 16:11:50 +0100 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2019-01-06 14:02:58 +0000 |
| commit | 085a2268083cfe1d22f696c9070726dcf2dc160f (patch) | |
| tree | 7ee20eb15d7c6ad9dfa66f2895573af5e90d3fc5 | |
| parent | 89393d633d70b9393af5b1c74af95c5e24bd99b0 (diff) | |
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>
74 files changed, 90 insertions, 59 deletions
diff --git a/src/mainboard/ocp/wedge100s/Kconfig b/src/mainboard/ocp/wedge100s/Kconfig index df6c57e09d..e850887fe3 100644 --- a/src/mainboard/ocp/wedge100s/Kconfig +++ b/src/mainboard/ocp/wedge100s/Kconfig @@ -9,7 +9,7 @@ config BOARD_SPECIFIC_OPTIONS select TSC_MONOTONIC_TIMER select HAVE_FSP_BIN if FSP_PACKAGE_DEFAULT select SERIRQ_CONTINUOUS_MODE - select SUPERIO_ITE_COMMON_ROMSTAGE + select SUPERIO_ITE_COMMON_PRE_RAM select FSP_EHCI1_ENABLE select MRC_CACHE_FMAP select ENABLE_FSP_FAST_BOOT 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 diff --git a/src/superio/intel/i8900/Makefile.inc b/src/superio/intel/i8900/Makefile.inc index fd1db21805..562d5d1128 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 382dbd7310..e73fd713b2 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 162b7f1545..8e52cf4e4e 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 7e0e80ec96..5b39672a5f 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 274959e2be..756c7ff71d 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 4ec94ce142..ba632243af 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 339f9627ca..f625bc19a6 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 226c913645..3c43c7ed73 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 6b0b79d864..969e7882d9 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 3201195ec1..848d71d913 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 7627d1c740..89382caa30 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 da42e0b87d..b8b9262500 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 266dfdf1bd..cf01242d31 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 90c3b509af..40a2f49529 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 72c79ce714..ad6ba08350 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 a0bf94db75..6c06c36740 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 5cae071429..0e1f6c3ddd 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 diff --git a/src/superio/nsc/pc87309/Makefile.inc b/src/superio/nsc/pc87309/Makefile.inc index e04c4f825e..0f0b3670bf 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 5c3ed24247..e0ee98af1e 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 a7b5536f25..6e558ac432 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 a4a0ed54e6..4294561557 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 f5f1300617..2f8ee76908 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/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 diff --git a/src/superio/serverengines/pilot/Makefile.inc b/src/superio/serverengines/pilot/Makefile.inc index e342b5ff28..95c62f5eec 100644 --- a/src/superio/serverengines/pilot/Makefile.inc +++ b/src/superio/serverengines/pilot/Makefile.inc @@ -14,5 +14,7 @@ ## GNU General Public License for more details. ## +bootblock-$(CONFIG_SUPERIO_SERVERENGINES_PILOT) += early_init.c +bootblock-$(CONFIG_SUPERIO_SERVERENGINES_PILOT) += early_serial.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 17f10b1e37..e106a02aa4 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 3a22a2e87e..5da94942a8 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 904a70ad08..51d77d4f10 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 8609ee09d3..ddb251d023 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 0dd272ce49..278aa1eabb 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 f465669975..dc6b9ab3ba 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 599e19ab35..65a0939e9e 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 0bff637a2b..a643407fbf 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 71abe9eaae..4bb0dac64a 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 6b3bf19466..ac7d7de652 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 bc458bfd8e..20a0b2a165 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 7d09b69df3..e9fdae2dc8 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 aae5f22c4d..b9bf35ce80 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 b0b7b8c520..49430815f1 100644 --- a/src/superio/winbond/Makefile.inc +++ b/src/superio/winbond/Makefile.inc @@ -14,7 +14,8 @@ ## ## include generic winbond pre-ram stage driver -romstage-$(CONFIG_SUPERIO_WINBOND_COMMON_ROMSTAGE) += common/early_init.c +bootblock-$(CONFIG_SUPERIO_WINBOND_COMMON_PRE_RAM) += common/early_init.c +romstage-$(CONFIG_SUPERIO_WINBOND_COMMON_PRE_RAM) += common/early_init.c subdirs-y += w83627dhg subdirs-y += w83627ehg diff --git a/src/superio/winbond/common/Kconfig b/src/superio/winbond/common/Kconfig index 2303547293..a2f7724dd3 100644 --- a/src/superio/winbond/common/Kconfig +++ b/src/superio/winbond/common/Kconfig @@ -16,5 +16,5 @@ # Generic Winbond romstage driver - Just enough UART initialisation code for # romstage. -config SUPERIO_WINBOND_COMMON_ROMSTAGE +config SUPERIO_WINBOND_COMMON_PRE_RAM bool diff --git a/src/superio/winbond/common/winbond.h b/src/superio/winbond/common/winbond.h index e472018bf1..e8b5c259d0 100644 --- a/src/superio/winbond/common/winbond.h +++ b/src/superio/winbond/common/winbond.h @@ -14,8 +14,8 @@ * GNU General Public License for more details. */ -#ifndef SUPERIO_WINBOND_COMMON_ROMSTAGE_H -#define SUPERIO_WINBOND_COMMON_ROMSTAGE_H +#ifndef SUPERIO_WINBOND_COMMON_PRE_RAM_H +#define SUPERIO_WINBOND_COMMON_PRE_RAM_H #include <arch/io.h> #include <stdint.h> @@ -27,4 +27,4 @@ void winbond_set_clksel_48(pnp_devfn_t dev); void pnp_enter_conf_state(pnp_devfn_t dev); void pnp_exit_conf_state(pnp_devfn_t dev); -#endif /* SUPERIO_WINBOND_COMMON_ROMSTAGE_H */ +#endif /* SUPERIO_WINBOND_COMMON_PRE_RAM_H */ diff --git a/src/superio/winbond/w83627dhg/Kconfig b/src/superio/winbond/w83627dhg/Kconfig index 46d710a497..9a51943ea9 100644 --- a/src/superio/winbond/w83627dhg/Kconfig +++ b/src/superio/winbond/w83627dhg/Kconfig @@ -16,4 +16,4 @@ config SUPERIO_WINBOND_W83627DHG bool - select SUPERIO_WINBOND_COMMON_ROMSTAGE + select SUPERIO_WINBOND_COMMON_PRE_RAM diff --git a/src/superio/winbond/w83627dhg/Makefile.inc b/src/superio/winbond/w83627dhg/Makefile.inc index 7d9dc97bca..4075a41dc7 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/w83627ehg/Kconfig b/src/superio/winbond/w83627ehg/Kconfig index bce73916b2..a00749164b 100644 --- a/src/superio/winbond/w83627ehg/Kconfig +++ b/src/superio/winbond/w83627ehg/Kconfig @@ -16,4 +16,4 @@ config SUPERIO_WINBOND_W83627EHG bool - select SUPERIO_WINBOND_COMMON_ROMSTAGE + select SUPERIO_WINBOND_COMMON_PRE_RAM diff --git a/src/superio/winbond/w83627hf/Kconfig b/src/superio/winbond/w83627hf/Kconfig index a50768a5e8..f0ebb82a63 100644 --- a/src/superio/winbond/w83627hf/Kconfig +++ b/src/superio/winbond/w83627hf/Kconfig @@ -16,4 +16,4 @@ config SUPERIO_WINBOND_W83627HF bool - select SUPERIO_WINBOND_COMMON_ROMSTAGE + select SUPERIO_WINBOND_COMMON_PRE_RAM diff --git a/src/superio/winbond/w83627thg/Kconfig b/src/superio/winbond/w83627thg/Kconfig index 163676a247..af54fb8157 100644 --- a/src/superio/winbond/w83627thg/Kconfig +++ b/src/superio/winbond/w83627thg/Kconfig @@ -16,4 +16,4 @@ config SUPERIO_WINBOND_W83627THG bool - select SUPERIO_WINBOND_COMMON_ROMSTAGE + select SUPERIO_WINBOND_COMMON_PRE_RAM diff --git a/src/superio/winbond/w83627uhg/Kconfig b/src/superio/winbond/w83627uhg/Kconfig index 45ef282d31..d42987a299 100644 --- a/src/superio/winbond/w83627uhg/Kconfig +++ b/src/superio/winbond/w83627uhg/Kconfig @@ -16,4 +16,4 @@ config SUPERIO_WINBOND_W83627UHG bool - select SUPERIO_WINBOND_COMMON_ROMSTAGE + select SUPERIO_WINBOND_COMMON_PRE_RAM diff --git a/src/superio/winbond/w83667hg-a/Kconfig b/src/superio/winbond/w83667hg-a/Kconfig index 74b78c2821..5614023764 100644 --- a/src/superio/winbond/w83667hg-a/Kconfig +++ b/src/superio/winbond/w83667hg-a/Kconfig @@ -16,4 +16,4 @@ config SUPERIO_WINBOND_W83667HG_A bool - select SUPERIO_WINBOND_COMMON_ROMSTAGE + select SUPERIO_WINBOND_COMMON_PRE_RAM diff --git a/src/superio/winbond/w83697hf/Kconfig b/src/superio/winbond/w83697hf/Kconfig index 2f1511b28a..6ca03fec59 100644 --- a/src/superio/winbond/w83697hf/Kconfig +++ b/src/superio/winbond/w83697hf/Kconfig @@ -16,4 +16,4 @@ config SUPERIO_WINBOND_W83697HF bool - select SUPERIO_WINBOND_COMMON_ROMSTAGE + select SUPERIO_WINBOND_COMMON_PRE_RAM diff --git a/src/superio/winbond/w83977tf/Kconfig b/src/superio/winbond/w83977tf/Kconfig index c814467760..92a24046cd 100644 --- a/src/superio/winbond/w83977tf/Kconfig +++ b/src/superio/winbond/w83977tf/Kconfig @@ -16,4 +16,4 @@ config SUPERIO_WINBOND_W83977TF bool - select SUPERIO_WINBOND_COMMON_ROMSTAGE + select SUPERIO_WINBOND_COMMON_PRE_RAM diff --git a/src/superio/winbond/wpcd376i/Kconfig b/src/superio/winbond/wpcd376i/Kconfig index d630836fcf..57cce7bbdc 100644 --- a/src/superio/winbond/wpcd376i/Kconfig +++ b/src/superio/winbond/wpcd376i/Kconfig @@ -16,4 +16,4 @@ config SUPERIO_WINBOND_WPCD376I bool - select SUPERIO_WINBOND_COMMON_ROMSTAGE + select SUPERIO_WINBOND_COMMON_PRE_RAM diff --git a/src/superio/winbond/wpcd376i/Makefile.inc b/src/superio/winbond/wpcd376i/Makefile.inc index 402aa32019..cebd175d80 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 |