From 5cf02a4ecdcf4c93a281289fa51dff90bdddd36f Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Wed, 6 Apr 2022 18:28:07 +0200 Subject: lib/hardwaremain.c: Move creating ACPI structs to bootstate hooks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit hardwaremain.c is the common ramstage entry to all platforms so move out ACPI code generation (x86 specific) to boot state hooks. Another reason to do this is the following: On some platforms that start in dram it makes little sense to have separate stages. To reduce the complexity we want to call the ramstage main function instead of loading a full stage. To make this scheme more maintainable it makes sense to move out as much functionality from the 'main' function as possible. Change-Id: I613b927b9a193fc076ffb1b2a40c617965ce2645 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/63414 Reviewed-by: Kyösti Mälkki Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- src/lib/hardwaremain.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/lib') diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c index 4a5b2f790c..e45ac9fe16 100644 --- a/src/lib/hardwaremain.c +++ b/src/lib/hardwaremain.c @@ -23,7 +23,6 @@ #include #include #include -#include #include static boot_state_t bs_pre_device(void *arg); @@ -462,13 +461,6 @@ void main(void) /* Handoff sleep type from romstage. */ acpi_is_wakeup_s3(); - /* Initialise GNVS early. */ - if (CONFIG(ACPI_SOC_NVS)) - acpi_create_gnvs(); - - if (CONFIG(CHROMEOS_NVS)) - chromeos_init_chromeos_acpi(); - /* Schedule the static boot state entries. */ boot_state_schedule_static_entries(); -- cgit v1.2.3