From fa5d0f835b1f3bb8907e616913cbf7b91d09ef26 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Tue, 12 Nov 2019 19:11:50 +0100 Subject: [PATCH] nb/intel/sandybridge: Set up console in bootblock Change-Id: Ia041b63201b2a4a2fe6ab11e3497c460f88061d1 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/36784 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/cpu/intel/model_206ax/Kconfig | 1 - src/mainboard/apple/macbookair4_2/Makefile.inc | 2 ++ .../apple/macbookair4_2/{romstage.c => early_init.c} | 4 ---- src/mainboard/asrock/b75pro3-m/Makefile.inc | 2 ++ src/mainboard/asrock/b75pro3-m/{romstage.c => early_init.c} | 3 ++- src/mainboard/asus/h61m-cs/Makefile.inc | 2 ++ src/mainboard/asus/h61m-cs/{romstage.c => early_init.c} | 3 ++- src/mainboard/asus/maximus_iv_gene-z/Makefile.inc | 2 ++ .../asus/maximus_iv_gene-z/{romstage.c => early_init.c} | 3 ++- src/mainboard/asus/p8h61-m_lx/Makefile.inc | 2 ++ src/mainboard/asus/p8h61-m_lx/{romstage.c => early_init.c} | 3 ++- src/mainboard/asus/p8h61-m_pro/Makefile.inc | 2 ++ src/mainboard/asus/p8h61-m_pro/{romstage.c => early_init.c} | 3 ++- src/mainboard/asus/p8z77-m_pro/Makefile.inc | 2 ++ src/mainboard/asus/p8z77-m_pro/{romstage.c => early_init.c} | 3 ++- src/mainboard/compulab/intense_pc/Makefile.inc | 2 ++ .../compulab/intense_pc/{romstage.c => early_init.c} | 3 ++- src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc | 2 ++ .../gigabyte/ga-b75m-d3h/{romstage.c => early_init.c} | 3 ++- src/mainboard/gigabyte/ga-h61m-s2pv/Makefile.inc | 2 ++ .../gigabyte/ga-h61m-s2pv/{romstage.c => early_init.c} | 3 ++- src/mainboard/google/butterfly/Makefile.inc | 2 ++ src/mainboard/google/butterfly/{romstage.c => early_init.c} | 5 ----- src/mainboard/google/link/Makefile.inc | 2 ++ src/mainboard/google/link/{romstage.c => early_init.c} | 4 ---- src/mainboard/google/parrot/Makefile.inc | 2 ++ src/mainboard/google/parrot/{romstage.c => early_init.c} | 4 ---- src/mainboard/google/stout/Makefile.inc | 2 ++ src/mainboard/google/stout/{romstage.c => early_init.c} | 4 ---- src/mainboard/hp/2570p/Makefile.inc | 2 ++ src/mainboard/hp/2570p/{romstage.c => early_init.c} | 3 ++- src/mainboard/hp/2760p/Makefile.inc | 2 ++ src/mainboard/hp/2760p/{romstage.c => early_init.c} | 3 ++- src/mainboard/hp/8460p/Makefile.inc | 2 ++ src/mainboard/hp/8460p/{romstage.c => early_init.c} | 3 ++- src/mainboard/hp/8470p/Makefile.inc | 2 ++ src/mainboard/hp/8470p/{romstage.c => early_init.c} | 3 ++- src/mainboard/hp/8770w/Makefile.inc | 2 ++ src/mainboard/hp/8770w/{romstage.c => early_init.c} | 3 ++- src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc | 2 ++ .../hp/compaq_8200_elite_sff/{romstage.c => early_init.c} | 3 ++- src/mainboard/hp/folio_9470m/Makefile.inc | 2 ++ src/mainboard/hp/folio_9470m/{romstage.c => early_init.c} | 3 ++- src/mainboard/hp/revolve_810_g1/Makefile.inc | 2 ++ .../hp/revolve_810_g1/{romstage.c => early_init.c} | 3 ++- src/mainboard/hp/z220_sff_workstation/Makefile.inc | 2 ++ .../hp/z220_sff_workstation/{romstage.c => early_init.c} | 3 ++- src/mainboard/intel/dcp847ske/Makefile.inc | 1 + src/mainboard/intel/dcp847ske/early_southbridge.c | 3 ++- src/mainboard/intel/emeraldlake2/Makefile.inc | 2 ++ .../intel/emeraldlake2/{romstage.c => early_init.c} | 3 ++- src/mainboard/kontron/ktqm77/Makefile.inc | 2 ++ src/mainboard/kontron/ktqm77/{romstage.c => early_init.c} | 3 ++- src/mainboard/lenovo/l520/Makefile.inc | 3 ++- src/mainboard/lenovo/l520/{romstage.c => early_init.c} | 4 ---- src/mainboard/lenovo/s230u/Makefile.inc | 2 ++ src/mainboard/lenovo/s230u/{romstage.c => early_init.c} | 4 ---- src/mainboard/lenovo/t420/Makefile.inc | 2 ++ src/mainboard/lenovo/t420/{romstage.c => early_init.c} | 4 ---- src/mainboard/lenovo/t420s/Makefile.inc | 2 ++ src/mainboard/lenovo/t420s/{romstage.c => early_init.c} | 4 ---- src/mainboard/lenovo/t430/Makefile.inc | 3 ++- src/mainboard/lenovo/t430/{romstage.c => early_init.c} | 4 ---- src/mainboard/lenovo/t430s/Makefile.inc | 2 ++ src/mainboard/lenovo/t430s/{romstage.c => early_init.c} | 4 ---- src/mainboard/lenovo/t520/Makefile.inc | 2 ++ src/mainboard/lenovo/t520/{romstage.c => early_init.c} | 4 ---- src/mainboard/lenovo/t530/Makefile.inc | 2 ++ src/mainboard/lenovo/t530/{romstage.c => early_init.c} | 4 ---- src/mainboard/lenovo/x131e/Makefile.inc | 2 ++ src/mainboard/lenovo/x131e/{romstage.c => early_init.c} | 4 ---- src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc | 2 ++ .../lenovo/x1_carbon_gen1/{romstage.c => early_init.c} | 4 ---- src/mainboard/lenovo/x220/Makefile.inc | 2 ++ src/mainboard/lenovo/x220/{romstage.c => early_init.c} | 4 ---- src/mainboard/lenovo/x230/Makefile.inc | 2 ++ src/mainboard/lenovo/x230/{romstage.c => early_init.c} | 4 ---- src/mainboard/msi/ms7707/Makefile.inc | 2 ++ src/mainboard/msi/ms7707/{romstage.c => early_init.c} | 4 ---- src/mainboard/roda/rv11/Makefile.inc | 5 ++++- src/mainboard/roda/rv11/{romstage.c => early_init.c} | 0 .../roda/rv11/variants/rv11/{romstage.c => early_init.c} | 4 ---- .../roda/rv11/variants/rw11/{romstage.c => early_init.c} | 3 ++- src/mainboard/samsung/lumpy/Makefile.inc | 2 ++ src/mainboard/samsung/lumpy/{romstage.c => early_init.c} | 4 ---- src/mainboard/samsung/stumpy/Makefile.inc | 2 ++ src/mainboard/samsung/stumpy/{romstage.c => early_init.c} | 3 ++- src/mainboard/sapphire/pureplatinumh61/Makefile.inc | 2 ++ .../sapphire/pureplatinumh61/{romstage.c => early_init.c} | 4 ---- src/northbridge/intel/sandybridge/romstage.c | 6 ------ src/northbridge/intel/sandybridge/sandybridge.h | 1 - 91 files changed, 133 insertions(+), 119 deletions(-) rename src/mainboard/apple/macbookair4_2/{romstage.c => early_init.c} (97%) rename src/mainboard/asrock/b75pro3-m/{romstage.c => early_init.c} (95%) rename src/mainboard/asus/h61m-cs/{romstage.c => early_init.c} (95%) rename src/mainboard/asus/maximus_iv_gene-z/{romstage.c => early_init.c} (96%) rename src/mainboard/asus/p8h61-m_lx/{romstage.c => early_init.c} (95%) rename src/mainboard/asus/p8h61-m_pro/{romstage.c => early_init.c} (96%) rename src/mainboard/asus/p8z77-m_pro/{romstage.c => early_init.c} (98%) rename src/mainboard/compulab/intense_pc/{romstage.c => early_init.c} (97%) rename src/mainboard/gigabyte/ga-b75m-d3h/{romstage.c => early_init.c} (97%) rename src/mainboard/gigabyte/ga-h61m-s2pv/{romstage.c => early_init.c} (95%) rename src/mainboard/google/butterfly/{romstage.c => early_init.c} (99%) rename src/mainboard/google/link/{romstage.c => early_init.c} (99%) rename src/mainboard/google/parrot/{romstage.c => early_init.c} (99%) rename src/mainboard/google/stout/{romstage.c => early_init.c} (99%) rename src/mainboard/hp/2570p/{romstage.c => early_init.c} (95%) rename src/mainboard/hp/2760p/{romstage.c => early_init.c} (94%) rename src/mainboard/hp/8460p/{romstage.c => early_init.c} (95%) rename src/mainboard/hp/8470p/{romstage.c => early_init.c} (95%) rename src/mainboard/hp/8770w/{romstage.c => early_init.c} (96%) rename src/mainboard/hp/compaq_8200_elite_sff/{romstage.c => early_init.c} (95%) rename src/mainboard/hp/folio_9470m/{romstage.c => early_init.c} (95%) rename src/mainboard/hp/revolve_810_g1/{romstage.c => early_init.c} (96%) rename src/mainboard/hp/z220_sff_workstation/{romstage.c => early_init.c} (95%) rename src/mainboard/intel/emeraldlake2/{romstage.c => early_init.c} (98%) rename src/mainboard/kontron/ktqm77/{romstage.c => early_init.c} (98%) rename src/mainboard/lenovo/l520/{romstage.c => early_init.c} (96%) rename src/mainboard/lenovo/s230u/{romstage.c => early_init.c} (98%) rename src/mainboard/lenovo/t420/{romstage.c => early_init.c} (98%) rename src/mainboard/lenovo/t420s/{romstage.c => early_init.c} (98%) rename src/mainboard/lenovo/t430/{romstage.c => early_init.c} (97%) rename src/mainboard/lenovo/t430s/{romstage.c => early_init.c} (95%) rename src/mainboard/lenovo/t520/{romstage.c => early_init.c} (98%) rename src/mainboard/lenovo/t530/{romstage.c => early_init.c} (97%) rename src/mainboard/lenovo/x131e/{romstage.c => early_init.c} (97%) rename src/mainboard/lenovo/x1_carbon_gen1/{romstage.c => early_init.c} (98%) rename src/mainboard/lenovo/x220/{romstage.c => early_init.c} (98%) rename src/mainboard/lenovo/x230/{romstage.c => early_init.c} (97%) rename src/mainboard/msi/ms7707/{romstage.c => early_init.c} (97%) rename src/mainboard/roda/rv11/{romstage.c => early_init.c} (100%) rename src/mainboard/roda/rv11/variants/rv11/{romstage.c => early_init.c} (98%) rename src/mainboard/roda/rv11/variants/rw11/{romstage.c => early_init.c} (98%) rename src/mainboard/samsung/lumpy/{romstage.c => early_init.c} (99%) rename src/mainboard/samsung/stumpy/{romstage.c => early_init.c} (99%) rename src/mainboard/sapphire/pureplatinumh61/{romstage.c => early_init.c} (97%) diff --git a/src/cpu/intel/model_206ax/Kconfig b/src/cpu/intel/model_206ax/Kconfig index 223703eb84..f316329552 100644 --- a/src/cpu/intel/model_206ax/Kconfig +++ b/src/cpu/intel/model_206ax/Kconfig @@ -22,7 +22,6 @@ config CPU_SPECIFIC_OPTIONS select PARALLEL_MP select NO_FIXED_XIP_ROM_SIZE select C_ENVIRONMENT_BOOTBLOCK - select NO_BOOTBLOCK_CONSOLE config SMM_TSEG_SIZE hex diff --git a/src/mainboard/apple/macbookair4_2/Makefile.inc b/src/mainboard/apple/macbookair4_2/Makefile.inc index da821939cc..665a95f195 100644 --- a/src/mainboard/apple/macbookair4_2/Makefile.inc +++ b/src/mainboard/apple/macbookair4_2/Makefile.inc @@ -7,3 +7,5 @@ spd.bin-file := spd.bin spd.bin-type := spd ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/apple/macbookair4_2/romstage.c b/src/mainboard/apple/macbookair4_2/early_init.c similarity index 97% rename from src/mainboard/apple/macbookair4_2/romstage.c rename to src/mainboard/apple/macbookair4_2/early_init.c index f445eea28e..bfd070ca1c 100644 --- a/src/mainboard/apple/macbookair4_2/romstage.c +++ b/src/mainboard/apple/macbookair4_2/early_init.c @@ -49,10 +49,6 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 1, 0, -1 }, }; -void mainboard_config_superio(void) -{ -} - void mainboard_get_spd(spd_raw_data *spd, bool id_only) { void *spd_file; diff --git a/src/mainboard/asrock/b75pro3-m/Makefile.inc b/src/mainboard/asrock/b75pro3-m/Makefile.inc index df00e3749e..598cd90e49 100644 --- a/src/mainboard/asrock/b75pro3-m/Makefile.inc +++ b/src/mainboard/asrock/b75pro3-m/Makefile.inc @@ -17,3 +17,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/asrock/b75pro3-m/romstage.c b/src/mainboard/asrock/b75pro3-m/early_init.c similarity index 95% rename from src/mainboard/asrock/b75pro3-m/romstage.c rename to src/mainboard/asrock/b75pro3-m/early_init.c index 983de07ff7..296c2de0e7 100644 --- a/src/mainboard/asrock/b75pro3-m/romstage.c +++ b/src/mainboard/asrock/b75pro3-m/early_init.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -40,7 +41,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 1, 0, 6 }, }; -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { /* Set GPIOs on superio, enable UART */ nuvoton_pnp_enter_conf_state(SERIAL_DEV); diff --git a/src/mainboard/asus/h61m-cs/Makefile.inc b/src/mainboard/asus/h61m-cs/Makefile.inc index af2b6742f0..f0b34f9840 100644 --- a/src/mainboard/asus/h61m-cs/Makefile.inc +++ b/src/mainboard/asus/h61m-cs/Makefile.inc @@ -1,3 +1,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/asus/h61m-cs/romstage.c b/src/mainboard/asus/h61m-cs/early_init.c similarity index 95% rename from src/mainboard/asus/h61m-cs/romstage.c rename to src/mainboard/asus/h61m-cs/early_init.c index 2aa243f4e8..2720e7a676 100644 --- a/src/mainboard/asus/h61m-cs/romstage.c +++ b/src/mainboard/asus/h61m-cs/early_init.c @@ -15,6 +15,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -44,7 +45,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 1, 0, 6 }, }; -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { nuvoton_pnp_enter_conf_state(SIO_DEV); pnp_set_logical_device(ACPI_DEV); diff --git a/src/mainboard/asus/maximus_iv_gene-z/Makefile.inc b/src/mainboard/asus/maximus_iv_gene-z/Makefile.inc index 0547b4d643..be8d9c3e85 100644 --- a/src/mainboard/asus/maximus_iv_gene-z/Makefile.inc +++ b/src/mainboard/asus/maximus_iv_gene-z/Makefile.inc @@ -17,3 +17,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/asus/maximus_iv_gene-z/romstage.c b/src/mainboard/asus/maximus_iv_gene-z/early_init.c similarity index 96% rename from src/mainboard/asus/maximus_iv_gene-z/romstage.c rename to src/mainboard/asus/maximus_iv_gene-z/early_init.c index c1e3975294..4b4fbbe483 100644 --- a/src/mainboard/asus/maximus_iv_gene-z/romstage.c +++ b/src/mainboard/asus/maximus_iv_gene-z/early_init.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -40,7 +41,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 1, 0, 6 }, }; -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { static const pnp_devfn_t GLOBAL_PSEUDO_DEV = PNP_DEV(0x2e, 0); static const pnp_devfn_t ACPI_DEV = PNP_DEV(0x2e, NCT6776_ACPI); diff --git a/src/mainboard/asus/p8h61-m_lx/Makefile.inc b/src/mainboard/asus/p8h61-m_lx/Makefile.inc index 9ee5136945..28f5e60f5d 100644 --- a/src/mainboard/asus/p8h61-m_lx/Makefile.inc +++ b/src/mainboard/asus/p8h61-m_lx/Makefile.inc @@ -17,3 +17,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/asus/p8h61-m_lx/romstage.c b/src/mainboard/asus/p8h61-m_lx/early_init.c similarity index 95% rename from src/mainboard/asus/p8h61-m_lx/romstage.c rename to src/mainboard/asus/p8h61-m_lx/early_init.c index d3361919a7..7dc8cd5334 100644 --- a/src/mainboard/asus/p8h61-m_lx/romstage.c +++ b/src/mainboard/asus/p8h61-m_lx/early_init.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -47,7 +48,7 @@ void mainboard_pch_lpc_setup(void) CNF1_LPC_EN | KBC_LPC_EN | LPT_LPC_EN | COMA_LPC_EN); } -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { nuvoton_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); } diff --git a/src/mainboard/asus/p8h61-m_pro/Makefile.inc b/src/mainboard/asus/p8h61-m_pro/Makefile.inc index 620a9c06a2..e402ffa605 100644 --- a/src/mainboard/asus/p8h61-m_pro/Makefile.inc +++ b/src/mainboard/asus/p8h61-m_pro/Makefile.inc @@ -2,3 +2,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/asus/p8h61-m_pro/romstage.c b/src/mainboard/asus/p8h61-m_pro/early_init.c similarity index 96% rename from src/mainboard/asus/p8h61-m_pro/romstage.c rename to src/mainboard/asus/p8h61-m_pro/early_init.c index ff5a67748d..4b02505bef 100644 --- a/src/mainboard/asus/p8h61-m_pro/romstage.c +++ b/src/mainboard/asus/p8h61-m_pro/early_init.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -49,7 +50,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 1, 0, 6 }, }; -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { /* Enable UART */ nuvoton_pnp_enter_conf_state(GLOBAL_DEV); diff --git a/src/mainboard/asus/p8z77-m_pro/Makefile.inc b/src/mainboard/asus/p8z77-m_pro/Makefile.inc index 8fc0eadbcc..e9fbd3cf88 100644 --- a/src/mainboard/asus/p8z77-m_pro/Makefile.inc +++ b/src/mainboard/asus/p8z77-m_pro/Makefile.inc @@ -18,3 +18,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/asus/p8z77-m_pro/romstage.c b/src/mainboard/asus/p8z77-m_pro/early_init.c similarity index 98% rename from src/mainboard/asus/p8z77-m_pro/romstage.c rename to src/mainboard/asus/p8z77-m_pro/early_init.c index 4963c3102c..ce479a8609 100644 --- a/src/mainboard/asus/p8z77-m_pro/romstage.c +++ b/src/mainboard/asus/p8z77-m_pro/early_init.c @@ -13,6 +13,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ +#include #include #include #include @@ -48,7 +49,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 0, 2, 6 } /* Port 13: Unused. Asus propietary DEBUG_PORT ??? */ }; -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { /* Setup COM/UART */ nuvoton_pnp_enter_conf_state(GLOBAL_DEV); diff --git a/src/mainboard/compulab/intense_pc/Makefile.inc b/src/mainboard/compulab/intense_pc/Makefile.inc index 620a9c06a2..e402ffa605 100644 --- a/src/mainboard/compulab/intense_pc/Makefile.inc +++ b/src/mainboard/compulab/intense_pc/Makefile.inc @@ -2,3 +2,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/compulab/intense_pc/romstage.c b/src/mainboard/compulab/intense_pc/early_init.c similarity index 97% rename from src/mainboard/compulab/intense_pc/romstage.c rename to src/mainboard/compulab/intense_pc/early_init.c index 4176703ac7..73acc46802 100644 --- a/src/mainboard/compulab/intense_pc/romstage.c +++ b/src/mainboard/compulab/intense_pc/early_init.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -60,7 +61,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 1, 0, 6 }, }; -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { const u16 port = SIO_PORT; const u16 runtime_port = 0x180; diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc b/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc index f5b33bd644..0abe48248e 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc +++ b/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc @@ -21,3 +21,5 @@ ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainb subdirs-y += variants/$(VARIANT_DIR) CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/romstage.c b/src/mainboard/gigabyte/ga-b75m-d3h/early_init.c similarity index 97% rename from src/mainboard/gigabyte/ga-b75m-d3h/romstage.c rename to src/mainboard/gigabyte/ga-b75m-d3h/early_init.c index a5d4c35b34..0a863fffd2 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/romstage.c +++ b/src/mainboard/gigabyte/ga-b75m-d3h/early_init.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -30,7 +31,7 @@ void mainboard_pch_lpc_setup(void) pci_write_config32(PCH_LPC_DEV, ETR3, 0x10000); } -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { /* Initialize SuperIO */ ite_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/Makefile.inc b/src/mainboard/gigabyte/ga-h61m-s2pv/Makefile.inc index 5166ce06af..9916927d25 100644 --- a/src/mainboard/gigabyte/ga-h61m-s2pv/Makefile.inc +++ b/src/mainboard/gigabyte/ga-h61m-s2pv/Makefile.inc @@ -3,3 +3,5 @@ romstage-y += variants/$(VARIANT_DIR)/gpio.c ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/romstage.c b/src/mainboard/gigabyte/ga-h61m-s2pv/early_init.c similarity index 95% rename from src/mainboard/gigabyte/ga-h61m-s2pv/romstage.c rename to src/mainboard/gigabyte/ga-h61m-s2pv/early_init.c index a68070fbe6..4157b09097 100644 --- a/src/mainboard/gigabyte/ga-h61m-s2pv/romstage.c +++ b/src/mainboard/gigabyte/ga-h61m-s2pv/early_init.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -40,7 +41,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 1, 0, 6 }, }; -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { if (!CONFIG(NO_UART_ON_SUPERIO)) { /* Enable serial port */ diff --git a/src/mainboard/google/butterfly/Makefile.inc b/src/mainboard/google/butterfly/Makefile.inc index fa9a4a9068..18f200647a 100644 --- a/src/mainboard/google/butterfly/Makefile.inc +++ b/src/mainboard/google/butterfly/Makefile.inc @@ -23,3 +23,5 @@ romstage-y += gpio.c smm-y += mainboard_smi.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/google/butterfly/romstage.c b/src/mainboard/google/butterfly/early_init.c similarity index 99% rename from src/mainboard/google/butterfly/romstage.c rename to src/mainboard/google/butterfly/early_init.c index e1d948d89f..d6566d1b09 100644 --- a/src/mainboard/google/butterfly/romstage.c +++ b/src/mainboard/google/butterfly/early_init.c @@ -112,11 +112,6 @@ void mainboard_get_spd(spd_raw_data *spd, bool id_only) read_spd(&spd[2], 0x52, id_only); } -void mainboard_config_superio(void) -{ -} - - void mainboard_fill_pei_data(struct pei_data *pei_data) { struct pei_data pei_data_template = { diff --git a/src/mainboard/google/link/Makefile.inc b/src/mainboard/google/link/Makefile.inc index 724150c138..22c28c8059 100644 --- a/src/mainboard/google/link/Makefile.inc +++ b/src/mainboard/google/link/Makefile.inc @@ -42,3 +42,5 @@ spd.bin-file := $(SPD_BIN) spd.bin-type := spd bootblock-y += gpio.c romstage-y += gpio.c +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/early_init.c similarity index 99% rename from src/mainboard/google/link/romstage.c rename to src/mainboard/google/link/early_init.c index 3fd90e9b17..9d985e622c 100644 --- a/src/mainboard/google/link/romstage.c +++ b/src/mainboard/google/link/early_init.c @@ -201,7 +201,3 @@ int mainboard_should_reset_usb(int s3resume) { return !s3resume; } - -void mainboard_config_superio(void) -{ -} diff --git a/src/mainboard/google/parrot/Makefile.inc b/src/mainboard/google/parrot/Makefile.inc index 67324bdff0..a2ed11e580 100644 --- a/src/mainboard/google/parrot/Makefile.inc +++ b/src/mainboard/google/parrot/Makefile.inc @@ -21,3 +21,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/early_init.c similarity index 99% rename from src/mainboard/google/parrot/romstage.c rename to src/mainboard/google/parrot/early_init.c index caff3f5436..3c07dc8c54 100644 --- a/src/mainboard/google/parrot/romstage.c +++ b/src/mainboard/google/parrot/early_init.c @@ -155,10 +155,6 @@ void mainboard_get_spd(spd_raw_data *spd, bool id_only) read_spd(&spd[2], 0x52, id_only); } -void mainboard_config_superio(void) -{ -} - int mainboard_should_reset_usb(int s3resume) { return !s3resume; diff --git a/src/mainboard/google/stout/Makefile.inc b/src/mainboard/google/stout/Makefile.inc index 59ac22dbae..3add36258b 100644 --- a/src/mainboard/google/stout/Makefile.inc +++ b/src/mainboard/google/stout/Makefile.inc @@ -26,3 +26,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/early_init.c similarity index 99% rename from src/mainboard/google/stout/romstage.c rename to src/mainboard/google/stout/early_init.c index d8e04eaa63..6ee982ad73 100644 --- a/src/mainboard/google/stout/romstage.c +++ b/src/mainboard/google/stout/early_init.c @@ -198,10 +198,6 @@ int mainboard_should_reset_usb(int s3resume) return !s3resume; } -void mainboard_config_superio(void) -{ -} - const struct southbridge_usb_port mainboard_usb_ports[] = { /* enabled usb oc pin length */ {1, 0, 0}, /* P0: USB 3.0 1 (OC0) */ diff --git a/src/mainboard/hp/2570p/Makefile.inc b/src/mainboard/hp/2570p/Makefile.inc index 4fbf73bbd3..1d258758be 100644 --- a/src/mainboard/hp/2570p/Makefile.inc +++ b/src/mainboard/hp/2570p/Makefile.inc @@ -17,3 +17,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/hp/2570p/romstage.c b/src/mainboard/hp/2570p/early_init.c similarity index 95% rename from src/mainboard/hp/2570p/romstage.c rename to src/mainboard/hp/2570p/early_init.c index f1d1e905f3..226367a569 100644 --- a/src/mainboard/hp/2570p/romstage.c +++ b/src/mainboard/hp/2570p/early_init.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -37,7 +38,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 0, 0, 6 }, }; -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { kbc1126_enter_conf(); kbc1126_mailbox_init(); diff --git a/src/mainboard/hp/2760p/Makefile.inc b/src/mainboard/hp/2760p/Makefile.inc index 4fbf73bbd3..1d258758be 100644 --- a/src/mainboard/hp/2760p/Makefile.inc +++ b/src/mainboard/hp/2760p/Makefile.inc @@ -17,3 +17,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/hp/2760p/romstage.c b/src/mainboard/hp/2760p/early_init.c similarity index 94% rename from src/mainboard/hp/2760p/romstage.c rename to src/mainboard/hp/2760p/early_init.c index acf5b1895a..98806de9f4 100644 --- a/src/mainboard/hp/2760p/romstage.c +++ b/src/mainboard/hp/2760p/early_init.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -36,7 +37,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 1, 1, 6 }, }; -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { kbc1126_enter_conf(); kbc1126_mailbox_init(); diff --git a/src/mainboard/hp/8460p/Makefile.inc b/src/mainboard/hp/8460p/Makefile.inc index 4fbf73bbd3..1d258758be 100644 --- a/src/mainboard/hp/8460p/Makefile.inc +++ b/src/mainboard/hp/8460p/Makefile.inc @@ -17,3 +17,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/hp/8460p/romstage.c b/src/mainboard/hp/8460p/early_init.c similarity index 95% rename from src/mainboard/hp/8460p/romstage.c rename to src/mainboard/hp/8460p/early_init.c index 4e4b175366..9c2a4b1139 100644 --- a/src/mainboard/hp/8460p/romstage.c +++ b/src/mainboard/hp/8460p/early_init.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -40,7 +41,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 1, 0, 6 }, /* docking */ }; -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { lpc47n217_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); kbc1126_enter_conf(); diff --git a/src/mainboard/hp/8470p/Makefile.inc b/src/mainboard/hp/8470p/Makefile.inc index 4fbf73bbd3..1d258758be 100644 --- a/src/mainboard/hp/8470p/Makefile.inc +++ b/src/mainboard/hp/8470p/Makefile.inc @@ -17,3 +17,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/hp/8470p/romstage.c b/src/mainboard/hp/8470p/early_init.c similarity index 95% rename from src/mainboard/hp/8470p/romstage.c rename to src/mainboard/hp/8470p/early_init.c index 8c9b29ef01..8dbe15815d 100644 --- a/src/mainboard/hp/8470p/romstage.c +++ b/src/mainboard/hp/8470p/early_init.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -39,7 +40,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 1, 0, 6 }, }; -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { lpc47n217_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); kbc1126_enter_conf(); diff --git a/src/mainboard/hp/8770w/Makefile.inc b/src/mainboard/hp/8770w/Makefile.inc index 910d6a6191..f4b387abed 100644 --- a/src/mainboard/hp/8770w/Makefile.inc +++ b/src/mainboard/hp/8770w/Makefile.inc @@ -15,3 +15,5 @@ bootblock-y += gpio.c romstage-y += gpio.c +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/hp/8770w/romstage.c b/src/mainboard/hp/8770w/early_init.c similarity index 96% rename from src/mainboard/hp/8770w/romstage.c rename to src/mainboard/hp/8770w/early_init.c index 8eefe4d6a2..3bd2ed7f51 100644 --- a/src/mainboard/hp/8770w/romstage.c +++ b/src/mainboard/hp/8770w/early_init.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -40,7 +41,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 1, 0, 6 }, /* Conn (eSATA Combo) */ }; -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { lpc47n217_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); kbc1126_enter_conf(); diff --git a/src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc b/src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc index af2b6742f0..f0b34f9840 100644 --- a/src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc +++ b/src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc @@ -1,3 +1,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/hp/compaq_8200_elite_sff/romstage.c b/src/mainboard/hp/compaq_8200_elite_sff/early_init.c similarity index 95% rename from src/mainboard/hp/compaq_8200_elite_sff/romstage.c rename to src/mainboard/hp/compaq_8200_elite_sff/early_init.c index df581fe542..882a604899 100644 --- a/src/mainboard/hp/compaq_8200_elite_sff/romstage.c +++ b/src/mainboard/hp/compaq_8200_elite_sff/early_init.c @@ -16,6 +16,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -44,7 +45,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 1, 0, -1 }, }; -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { if (CONFIG(CONSOLE_SERIAL)) nuvoton_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/hp/folio_9470m/Makefile.inc b/src/mainboard/hp/folio_9470m/Makefile.inc index 4fbf73bbd3..1d258758be 100644 --- a/src/mainboard/hp/folio_9470m/Makefile.inc +++ b/src/mainboard/hp/folio_9470m/Makefile.inc @@ -17,3 +17,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/hp/folio_9470m/romstage.c b/src/mainboard/hp/folio_9470m/early_init.c similarity index 95% rename from src/mainboard/hp/folio_9470m/romstage.c rename to src/mainboard/hp/folio_9470m/early_init.c index 07ee1eb283..e5a1892023 100644 --- a/src/mainboard/hp/folio_9470m/romstage.c +++ b/src/mainboard/hp/folio_9470m/early_init.c @@ -15,6 +15,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -38,7 +39,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 0, 0, 6 }, /* B1P6 */ }; -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { kbc1126_enter_conf(); kbc1126_mailbox_init(); diff --git a/src/mainboard/hp/revolve_810_g1/Makefile.inc b/src/mainboard/hp/revolve_810_g1/Makefile.inc index 574f56e107..0a15c42fdd 100644 --- a/src/mainboard/hp/revolve_810_g1/Makefile.inc +++ b/src/mainboard/hp/revolve_810_g1/Makefile.inc @@ -20,3 +20,5 @@ ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads # FIXME: Other varients with same size onboard ram may exist. SPD_SOURCES = hynix_4g +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/hp/revolve_810_g1/romstage.c b/src/mainboard/hp/revolve_810_g1/early_init.c similarity index 96% rename from src/mainboard/hp/revolve_810_g1/romstage.c rename to src/mainboard/hp/revolve_810_g1/early_init.c index 24247420ab..b464ce3daa 100644 --- a/src/mainboard/hp/revolve_810_g1/romstage.c +++ b/src/mainboard/hp/revolve_810_g1/early_init.c @@ -15,6 +15,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -46,7 +47,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 0, 0, 6 }, /* B1P6 */ }; -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { kbc1126_enter_conf(); kbc1126_mailbox_init(); diff --git a/src/mainboard/hp/z220_sff_workstation/Makefile.inc b/src/mainboard/hp/z220_sff_workstation/Makefile.inc index af2b6742f0..f0b34f9840 100644 --- a/src/mainboard/hp/z220_sff_workstation/Makefile.inc +++ b/src/mainboard/hp/z220_sff_workstation/Makefile.inc @@ -1,3 +1,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/hp/z220_sff_workstation/romstage.c b/src/mainboard/hp/z220_sff_workstation/early_init.c similarity index 95% rename from src/mainboard/hp/z220_sff_workstation/romstage.c rename to src/mainboard/hp/z220_sff_workstation/early_init.c index 0b9ffe4d56..fd70690079 100644 --- a/src/mainboard/hp/z220_sff_workstation/romstage.c +++ b/src/mainboard/hp/z220_sff_workstation/early_init.c @@ -16,6 +16,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -44,7 +45,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 1, 0, 7 }, }; -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { if (CONFIG(CONSOLE_SERIAL)) nuvoton_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/intel/dcp847ske/Makefile.inc b/src/mainboard/intel/dcp847ske/Makefile.inc index ec86d8455d..28bc7c7cc9 100644 --- a/src/mainboard/intel/dcp847ske/Makefile.inc +++ b/src/mainboard/intel/dcp847ske/Makefile.inc @@ -1,3 +1,4 @@ +bootblock-y += early_southbridge.c romstage-y += early_southbridge.c bootblock-y += gpio.c romstage-y += gpio.c diff --git a/src/mainboard/intel/dcp847ske/early_southbridge.c b/src/mainboard/intel/dcp847ske/early_southbridge.c index 8f38270388..53f5564a97 100644 --- a/src/mainboard/intel/dcp847ske/early_southbridge.c +++ b/src/mainboard/intel/dcp847ske/early_southbridge.c @@ -16,6 +16,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -160,7 +161,7 @@ static void superio_init(void) SUPERIO_LOCK; } -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { superio_init(); hwm_init(); diff --git a/src/mainboard/intel/emeraldlake2/Makefile.inc b/src/mainboard/intel/emeraldlake2/Makefile.inc index 974241dcc2..3e78db075b 100644 --- a/src/mainboard/intel/emeraldlake2/Makefile.inc +++ b/src/mainboard/intel/emeraldlake2/Makefile.inc @@ -17,3 +17,5 @@ romstage-y += chromeos.c ramstage-y += chromeos.c bootblock-y += gpio.c romstage-y += gpio.c +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/intel/emeraldlake2/romstage.c b/src/mainboard/intel/emeraldlake2/early_init.c similarity index 98% rename from src/mainboard/intel/emeraldlake2/romstage.c rename to src/mainboard/intel/emeraldlake2/early_init.c index 2cfb5569fb..94a46550b2 100644 --- a/src/mainboard/intel/emeraldlake2/romstage.c +++ b/src/mainboard/intel/emeraldlake2/early_init.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -43,7 +44,7 @@ void mainboard_pch_lpc_setup(void) } } -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { const u16 port = SIO_PORT; const u16 runtime_port = 0x180; diff --git a/src/mainboard/kontron/ktqm77/Makefile.inc b/src/mainboard/kontron/ktqm77/Makefile.inc index 620a9c06a2..e402ffa605 100644 --- a/src/mainboard/kontron/ktqm77/Makefile.inc +++ b/src/mainboard/kontron/ktqm77/Makefile.inc @@ -2,3 +2,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/kontron/ktqm77/romstage.c b/src/mainboard/kontron/ktqm77/early_init.c similarity index 98% rename from src/mainboard/kontron/ktqm77/romstage.c rename to src/mainboard/kontron/ktqm77/early_init.c index 3b49653f97..6a483bc670 100644 --- a/src/mainboard/kontron/ktqm77/romstage.c +++ b/src/mainboard/kontron/ktqm77/early_init.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -54,7 +55,7 @@ void mainboard_late_rcba_config(void) RCBA32(FD) = reg32; } -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { int lvds_3v = 0; /* 0 (5V) or 1 (3V3) */ int dis_bl_inv = 1; /* backlight inversion: 1 = disabled, 0 = enabled */ diff --git a/src/mainboard/lenovo/l520/Makefile.inc b/src/mainboard/lenovo/l520/Makefile.inc index 14cd059011..c03276795c 100644 --- a/src/mainboard/lenovo/l520/Makefile.inc +++ b/src/mainboard/lenovo/l520/Makefile.inc @@ -13,9 +13,10 @@ ## GNU General Public License for more details. ## -romstage-y += romstage.c bootblock-y += gpio.c romstage-y += gpio.c smm-y += smihandler.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/lenovo/l520/romstage.c b/src/mainboard/lenovo/l520/early_init.c similarity index 96% rename from src/mainboard/lenovo/l520/romstage.c rename to src/mainboard/lenovo/l520/early_init.c index af73537f24..d63a667737 100644 --- a/src/mainboard/lenovo/l520/romstage.c +++ b/src/mainboard/lenovo/l520/early_init.c @@ -39,10 +39,6 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 1, 0, -1 }, }; -void mainboard_config_superio(void) -{ -} - void mainboard_get_spd(spd_raw_data *spd, bool id_only) { read_spd(&spd[0], 0x50, id_only); diff --git a/src/mainboard/lenovo/s230u/Makefile.inc b/src/mainboard/lenovo/s230u/Makefile.inc index aa4c4f879d..12e77097e4 100644 --- a/src/mainboard/lenovo/s230u/Makefile.inc +++ b/src/mainboard/lenovo/s230u/Makefile.inc @@ -16,3 +16,5 @@ SPD_SOURCES += samsung_2gb # 0b0111 SPD_SOURCES += hynix_2gb # 0b1000 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/lenovo/s230u/romstage.c b/src/mainboard/lenovo/s230u/early_init.c similarity index 98% rename from src/mainboard/lenovo/s230u/romstage.c rename to src/mainboard/lenovo/s230u/early_init.c index 0552170668..6bc92b2cac 100644 --- a/src/mainboard/lenovo/s230u/romstage.c +++ b/src/mainboard/lenovo/s230u/early_init.c @@ -64,10 +64,6 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 1, 1, 6 }, }; -void mainboard_config_superio(void) -{ -} - static const char *mainboard_spd_names[9] = { "ELPIDA 4GB", "SAMSUNG 4GB", diff --git a/src/mainboard/lenovo/t420/Makefile.inc b/src/mainboard/lenovo/t420/Makefile.inc index 3914f51561..080812e44a 100644 --- a/src/mainboard/lenovo/t420/Makefile.inc +++ b/src/mainboard/lenovo/t420/Makefile.inc @@ -18,3 +18,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/lenovo/t420/romstage.c b/src/mainboard/lenovo/t420/early_init.c similarity index 98% rename from src/mainboard/lenovo/t420/romstage.c rename to src/mainboard/lenovo/t420/early_init.c index e04803f165..50e62586a5 100644 --- a/src/mainboard/lenovo/t420/romstage.c +++ b/src/mainboard/lenovo/t420/early_init.c @@ -82,7 +82,3 @@ void mainboard_early_init(int s3resume) { hybrid_graphics_init(); } - -void mainboard_config_superio(void) -{ -} diff --git a/src/mainboard/lenovo/t420s/Makefile.inc b/src/mainboard/lenovo/t420s/Makefile.inc index 3914f51561..080812e44a 100644 --- a/src/mainboard/lenovo/t420s/Makefile.inc +++ b/src/mainboard/lenovo/t420s/Makefile.inc @@ -18,3 +18,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/lenovo/t420s/romstage.c b/src/mainboard/lenovo/t420s/early_init.c similarity index 98% rename from src/mainboard/lenovo/t420s/romstage.c rename to src/mainboard/lenovo/t420s/early_init.c index 764997297e..1357a0ae52 100644 --- a/src/mainboard/lenovo/t420s/romstage.c +++ b/src/mainboard/lenovo/t420s/early_init.c @@ -81,7 +81,3 @@ void mainboard_early_init(int s3resume) { hybrid_graphics_init(); } - -void mainboard_config_superio(void) -{ -} diff --git a/src/mainboard/lenovo/t430/Makefile.inc b/src/mainboard/lenovo/t430/Makefile.inc index 409d4842a9..0f49600c7d 100644 --- a/src/mainboard/lenovo/t430/Makefile.inc +++ b/src/mainboard/lenovo/t430/Makefile.inc @@ -1,6 +1,7 @@ -romstage-y += romstage.c bootblock-y += gpio.c romstage-y += gpio.c smm-y += smihandler.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/lenovo/t430/romstage.c b/src/mainboard/lenovo/t430/early_init.c similarity index 97% rename from src/mainboard/lenovo/t430/romstage.c rename to src/mainboard/lenovo/t430/early_init.c index f1e724be47..74c8b60883 100644 --- a/src/mainboard/lenovo/t430/romstage.c +++ b/src/mainboard/lenovo/t430/early_init.c @@ -72,10 +72,6 @@ void mainboard_early_init(int s3resume) hybrid_graphics_init(); } -void mainboard_config_superio(void) -{ -} - void mainboard_get_spd(spd_raw_data *spd, bool id_only) { read_spd(&spd[0], 0x50, id_only); diff --git a/src/mainboard/lenovo/t430s/Makefile.inc b/src/mainboard/lenovo/t430s/Makefile.inc index 425047fe44..d0e69a838f 100644 --- a/src/mainboard/lenovo/t430s/Makefile.inc +++ b/src/mainboard/lenovo/t430s/Makefile.inc @@ -20,3 +20,5 @@ romstage-y += variants/$(VARIANT_DIR)/romstage.c ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads subdirs-$(CONFIG_BOARD_LENOVO_T431S) += variants/$(VARIANT_DIR)/spd +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/lenovo/t430s/romstage.c b/src/mainboard/lenovo/t430s/early_init.c similarity index 95% rename from src/mainboard/lenovo/t430s/romstage.c rename to src/mainboard/lenovo/t430s/early_init.c index 6503c9a920..0757c06fbd 100644 --- a/src/mainboard/lenovo/t430s/romstage.c +++ b/src/mainboard/lenovo/t430s/early_init.c @@ -23,7 +23,3 @@ void mainboard_pch_lpc_setup(void) { pci_write_config32(PCH_LPC_DEV, ETR3, 0x10000); } - -void mainboard_config_superio(void) -{ -} diff --git a/src/mainboard/lenovo/t520/Makefile.inc b/src/mainboard/lenovo/t520/Makefile.inc index 5310bbf530..8f3c154418 100644 --- a/src/mainboard/lenovo/t520/Makefile.inc +++ b/src/mainboard/lenovo/t520/Makefile.inc @@ -18,3 +18,5 @@ bootblock-y += variants/$(VARIANT_DIR)/gpio.c romstage-y += variants/$(VARIANT_DIR)/gpio.c romstage-y += variants/$(VARIANT_DIR)/romstage.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/lenovo/t520/romstage.c b/src/mainboard/lenovo/t520/early_init.c similarity index 98% rename from src/mainboard/lenovo/t520/romstage.c rename to src/mainboard/lenovo/t520/early_init.c index caf54bd5df..cfa69b7082 100644 --- a/src/mainboard/lenovo/t520/romstage.c +++ b/src/mainboard/lenovo/t520/early_init.c @@ -77,7 +77,3 @@ void mainboard_early_init(int s3resume) { hybrid_graphics_init(); } - -void mainboard_config_superio(void) -{ -} diff --git a/src/mainboard/lenovo/t530/Makefile.inc b/src/mainboard/lenovo/t530/Makefile.inc index 5310bbf530..8f3c154418 100644 --- a/src/mainboard/lenovo/t530/Makefile.inc +++ b/src/mainboard/lenovo/t530/Makefile.inc @@ -18,3 +18,5 @@ bootblock-y += variants/$(VARIANT_DIR)/gpio.c romstage-y += variants/$(VARIANT_DIR)/gpio.c romstage-y += variants/$(VARIANT_DIR)/romstage.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/lenovo/t530/romstage.c b/src/mainboard/lenovo/t530/early_init.c similarity index 97% rename from src/mainboard/lenovo/t530/romstage.c rename to src/mainboard/lenovo/t530/early_init.c index 85c3090bb5..34c61e4e49 100644 --- a/src/mainboard/lenovo/t530/romstage.c +++ b/src/mainboard/lenovo/t530/early_init.c @@ -60,7 +60,3 @@ void mainboard_early_init(int s3resume) { hybrid_graphics_init(); } - -void mainboard_config_superio(void) -{ -} diff --git a/src/mainboard/lenovo/x131e/Makefile.inc b/src/mainboard/lenovo/x131e/Makefile.inc index 4fbf73bbd3..1d258758be 100644 --- a/src/mainboard/lenovo/x131e/Makefile.inc +++ b/src/mainboard/lenovo/x131e/Makefile.inc @@ -17,3 +17,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/lenovo/x131e/romstage.c b/src/mainboard/lenovo/x131e/early_init.c similarity index 97% rename from src/mainboard/lenovo/x131e/romstage.c rename to src/mainboard/lenovo/x131e/early_init.c index 45d6b88099..fe9fec0cb6 100644 --- a/src/mainboard/lenovo/x131e/romstage.c +++ b/src/mainboard/lenovo/x131e/early_init.c @@ -42,7 +42,3 @@ void mainboard_get_spd(spd_raw_data *spd, bool id_only) read_spd(&spd[0], 0x50, id_only); read_spd(&spd[2], 0x52, id_only); } - -void mainboard_config_superio(void) -{ -} diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc b/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc index 8ce77fc77d..f6331a61d1 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc +++ b/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc @@ -20,3 +20,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c b/src/mainboard/lenovo/x1_carbon_gen1/early_init.c similarity index 98% rename from src/mainboard/lenovo/x1_carbon_gen1/romstage.c rename to src/mainboard/lenovo/x1_carbon_gen1/early_init.c index 1f027ffab8..c70b21d36b 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c +++ b/src/mainboard/lenovo/x1_carbon_gen1/early_init.c @@ -99,7 +99,3 @@ void mainboard_get_spd(spd_raw_data *spd, bool id_only) memcpy(&spd[0], memory, 256); memcpy(&spd[2], memory, 256); } - -void mainboard_config_superio(void) -{ -} diff --git a/src/mainboard/lenovo/x220/Makefile.inc b/src/mainboard/lenovo/x220/Makefile.inc index c0ba457c57..4363770d28 100644 --- a/src/mainboard/lenovo/x220/Makefile.inc +++ b/src/mainboard/lenovo/x220/Makefile.inc @@ -19,3 +19,5 @@ romstage-y += variants/$(VARIANT_DIR)/gpio.c romstage-y += variants/$(VARIANT_DIR)/romstage.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/lenovo/x220/romstage.c b/src/mainboard/lenovo/x220/early_init.c similarity index 98% rename from src/mainboard/lenovo/x220/romstage.c rename to src/mainboard/lenovo/x220/early_init.c index 72dd8dddca..8ee807cb5d 100644 --- a/src/mainboard/lenovo/x220/romstage.c +++ b/src/mainboard/lenovo/x220/early_init.c @@ -87,10 +87,6 @@ void mainboard_get_spd(spd_raw_data *spd, bool id_only) read_spd (&spd[2], 0x51, id_only); } -void mainboard_config_superio(void) -{ -} - int mainboard_should_reset_usb(int s3resume) { return !s3resume; diff --git a/src/mainboard/lenovo/x230/Makefile.inc b/src/mainboard/lenovo/x230/Makefile.inc index 3914f51561..080812e44a 100644 --- a/src/mainboard/lenovo/x230/Makefile.inc +++ b/src/mainboard/lenovo/x230/Makefile.inc @@ -18,3 +18,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/lenovo/x230/romstage.c b/src/mainboard/lenovo/x230/early_init.c similarity index 97% rename from src/mainboard/lenovo/x230/romstage.c rename to src/mainboard/lenovo/x230/early_init.c index 56f5a90670..b737e7de83 100644 --- a/src/mainboard/lenovo/x230/romstage.c +++ b/src/mainboard/lenovo/x230/early_init.c @@ -51,7 +51,3 @@ void mainboard_get_spd(spd_raw_data *spd, bool id_only) read_spd (&spd[0], 0x50, id_only); read_spd (&spd[2], 0x51, id_only); } - -void mainboard_config_superio(void) -{ -} diff --git a/src/mainboard/msi/ms7707/Makefile.inc b/src/mainboard/msi/ms7707/Makefile.inc index 0ec849f5b5..2fa05da9ac 100644 --- a/src/mainboard/msi/ms7707/Makefile.inc +++ b/src/mainboard/msi/ms7707/Makefile.inc @@ -1,2 +1,4 @@ bootblock-y += gpio.c romstage-y += gpio.c +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/msi/ms7707/romstage.c b/src/mainboard/msi/ms7707/early_init.c similarity index 97% rename from src/mainboard/msi/ms7707/romstage.c rename to src/mainboard/msi/ms7707/early_init.c index 1dd3fd06a8..480e196e90 100644 --- a/src/mainboard/msi/ms7707/romstage.c +++ b/src/mainboard/msi/ms7707/early_init.c @@ -45,10 +45,6 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { {1, 0, 6}, }; -void mainboard_config_superio(void) -{ -} - void mainboard_get_spd(spd_raw_data *spd, bool id_only) { read_spd(&spd[0], 0x50, id_only); diff --git a/src/mainboard/roda/rv11/Makefile.inc b/src/mainboard/roda/rv11/Makefile.inc index 422b448e24..a3d6d5913f 100644 --- a/src/mainboard/roda/rv11/Makefile.inc +++ b/src/mainboard/roda/rv11/Makefile.inc @@ -16,7 +16,10 @@ bootblock-y += gpio.c romstage-y += gpio.c -romstage-y += variants/$(VARIANT_DIR)/romstage.c +bootblock-y += variants/$(VARIANT_DIR)/early_init.c +romstage-y += variants/$(VARIANT_DIR)/early_init.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/roda/rv11/romstage.c b/src/mainboard/roda/rv11/early_init.c similarity index 100% rename from src/mainboard/roda/rv11/romstage.c rename to src/mainboard/roda/rv11/early_init.c diff --git a/src/mainboard/roda/rv11/variants/rv11/romstage.c b/src/mainboard/roda/rv11/variants/rv11/early_init.c similarity index 98% rename from src/mainboard/roda/rv11/variants/rv11/romstage.c rename to src/mainboard/roda/rv11/variants/rv11/early_init.c index 38c4064772..5081c005aa 100644 --- a/src/mainboard/roda/rv11/variants/rv11/romstage.c +++ b/src/mainboard/roda/rv11/variants/rv11/early_init.c @@ -21,10 +21,6 @@ #include #include -void mainboard_config_superio(void) -{ -} - void mainboard_fill_pei_data(struct pei_data *const pei_data) { const struct pei_data pei_data_template = { diff --git a/src/mainboard/roda/rv11/variants/rw11/romstage.c b/src/mainboard/roda/rv11/variants/rw11/early_init.c similarity index 98% rename from src/mainboard/roda/rv11/variants/rw11/romstage.c rename to src/mainboard/roda/rv11/variants/rw11/early_init.c index 7321dac398..f3865fc359 100644 --- a/src/mainboard/roda/rv11/variants/rw11/romstage.c +++ b/src/mainboard/roda/rv11/variants/rw11/early_init.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -25,7 +26,7 @@ #include #include -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { const pnp_devfn_t dev = PNP_DEV(0x2e, IT8783EF_GPIO); diff --git a/src/mainboard/samsung/lumpy/Makefile.inc b/src/mainboard/samsung/lumpy/Makefile.inc index 3e28bd4878..e6e65aa096 100644 --- a/src/mainboard/samsung/lumpy/Makefile.inc +++ b/src/mainboard/samsung/lumpy/Makefile.inc @@ -31,3 +31,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/early_init.c similarity index 99% rename from src/mainboard/samsung/lumpy/romstage.c rename to src/mainboard/samsung/lumpy/early_init.c index d6ded7a559..6bc545c57e 100644 --- a/src/mainboard/samsung/lumpy/romstage.c +++ b/src/mainboard/samsung/lumpy/early_init.c @@ -232,7 +232,3 @@ int mainboard_should_reset_usb(int s3resume) { return !s3resume; } - -void mainboard_config_superio(void) -{ -} diff --git a/src/mainboard/samsung/stumpy/Makefile.inc b/src/mainboard/samsung/stumpy/Makefile.inc index 497accadb9..de233ce0cd 100644 --- a/src/mainboard/samsung/stumpy/Makefile.inc +++ b/src/mainboard/samsung/stumpy/Makefile.inc @@ -19,3 +19,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/early_init.c similarity index 99% rename from src/mainboard/samsung/stumpy/romstage.c rename to src/mainboard/samsung/stumpy/early_init.c index 35dc055baa..03cb8d70a3 100644 --- a/src/mainboard/samsung/stumpy/romstage.c +++ b/src/mainboard/samsung/stumpy/early_init.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -239,7 +240,7 @@ int mainboard_should_reset_usb(int s3resume) } } -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { setup_sio_gpios(); diff --git a/src/mainboard/sapphire/pureplatinumh61/Makefile.inc b/src/mainboard/sapphire/pureplatinumh61/Makefile.inc index 4cf022a474..8d8f3ee51f 100644 --- a/src/mainboard/sapphire/pureplatinumh61/Makefile.inc +++ b/src/mainboard/sapphire/pureplatinumh61/Makefile.inc @@ -18,3 +18,5 @@ bootblock-y += gpio.c romstage-y += gpio.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/sapphire/pureplatinumh61/romstage.c b/src/mainboard/sapphire/pureplatinumh61/early_init.c similarity index 97% rename from src/mainboard/sapphire/pureplatinumh61/romstage.c rename to src/mainboard/sapphire/pureplatinumh61/early_init.c index bc08fd8bf2..be665617a4 100644 --- a/src/mainboard/sapphire/pureplatinumh61/romstage.c +++ b/src/mainboard/sapphire/pureplatinumh61/early_init.c @@ -48,10 +48,6 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 1, 0, 6 }, }; -void mainboard_config_superio(void) -{ -} - void mainboard_get_spd(spd_raw_data *spd, bool id_only) { read_spd(&spd[0], 0x50, id_only); diff --git a/src/northbridge/intel/sandybridge/romstage.c b/src/northbridge/intel/sandybridge/romstage.c index c76d2f4f4a..079e1b13ba 100644 --- a/src/northbridge/intel/sandybridge/romstage.c +++ b/src/northbridge/intel/sandybridge/romstage.c @@ -63,17 +63,11 @@ void mainboard_romstage_entry(void) /* Init LPC, GPIO, BARs, disable watchdog ... */ early_pch_init(); - /* Initialize superio */ - mainboard_config_superio(); - /* USB is initialized in MRC if MRC is used. */ if (CONFIG(USE_NATIVE_RAMINIT)) { early_usb_init(mainboard_usb_ports); } - /* Initialize console device(s) */ - console_init(); - /* Perform some early chipset initialization required * before RAM initialization can work */ diff --git a/src/northbridge/intel/sandybridge/sandybridge.h b/src/northbridge/intel/sandybridge/sandybridge.h index cfda2e838b..dff943dd92 100644 --- a/src/northbridge/intel/sandybridge/sandybridge.h +++ b/src/northbridge/intel/sandybridge/sandybridge.h @@ -215,7 +215,6 @@ void early_init_dmi(void); /* mainboard_early_init: Optional mainboard callback run after console init but before raminit. */ void mainboard_early_init(int s3resume); -void mainboard_config_superio(void); int mainboard_should_reset_usb(int s3resume); void perform_raminit(int s3resume); enum platform_type get_platform_type(void);