From e19c8b0091022ae3f490601aed0c290cd5171b79 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Thu, 2 Apr 2015 23:20:45 +0200 Subject: acpi: protect acpi generators from PRE_RAM & SMM acpi generators run only in RAM stage. Change-Id: Ia2ab677848fef38976c85dda1c2773ae065856b0 Signed-off-by: Alexander Couzens Reviewed-on: http://review.coreboot.org/9249 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/arch/x86/include/arch/acpi.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/arch/x86') diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 771b51c9eb..b85f3e1be0 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -28,6 +28,7 @@ #define __ASM_ACPI_H #include +#include #define RSDP_SIG "RSD PTR " /* RSDT pointer signature */ #define ACPI_TABLE_CREATOR "COREBOOT" /* Must be exactly 8 bytes long! */ @@ -530,9 +531,14 @@ void acpi_create_srat(acpi_srat_t *srat); void acpi_create_slit(acpi_slit_t *slit); +#if ENV_RAMSTAGE void acpi_create_hpet(acpi_hpet_t *hpet); unsigned long acpi_write_hpet(unsigned long start, acpi_rsdp_t *rsdp); +/* cpu/intel/speedstep/acpi.c */ +void generate_cpu_entries(void); +#endif + void acpi_create_mcfg(acpi_mcfg_t *mcfg); void acpi_create_facs(acpi_facs_t *facs); @@ -559,9 +565,6 @@ unsigned long acpi_fill_hest(acpi_hest_t *hest); void acpi_save_gnvs(u32 gnvs_address); -/* cpu/intel/speedstep/acpi.c */ -void generate_cpu_entries(void); - /* For ACPI S3 support. */ void acpi_fail_wakeup(void); void acpi_resume(void *wake_vec); -- cgit v1.2.3