summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2015-04-02 23:20:45 +0200
committerPeter Stuge <peter@stuge.se>2015-04-05 04:07:25 +0200
commite19c8b0091022ae3f490601aed0c290cd5171b79 (patch)
tree7354ac1f827b7a98237ffc4ac2fc200718f8d456
parent23d12329773f1dbbe43bfec3b8b0781ca62eb474 (diff)
acpi: protect acpi generators from PRE_RAM & SMM
acpi generators run only in RAM stage. Change-Id: Ia2ab677848fef38976c85dda1c2773ae065856b0 Signed-off-by: Alexander Couzens <lynxis@fe80.eu> Reviewed-on: http://review.coreboot.org/9249 Reviewed-by: Aaron Durbin <adurbin@google.com> Tested-by: build bot (Jenkins)
-rw-r--r--src/arch/x86/include/arch/acpi.h9
1 files changed, 6 insertions, 3 deletions
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 <stdint.h>
+#include <rules.h>
#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);