[coreboot-gerrit] New patch to review for coreboot: 15defe1 AGESA: Declare acpi_is_wakeup_early() only once
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Fri Jun 20 18:28:43 CEST 2014
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6086
-gerrit
commit 15defe1d474f29192cba505edc50f668a3a6524b
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Tue Dec 10 09:03:17 2013 +0200
AGESA: Declare acpi_is_wakeup_early() only once
Follow-up patches will unify this and acpi_get_sleep_type() and
other acpi_is_wakeup() variants.
Change-Id: I0ed5dd3596eece195527bdfab213c49ab5b5f9c8
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/arch/x86/include/arch/acpi.h | 3 +++
src/mainboard/amd/olivehill/romstage.c | 1 +
src/mainboard/amd/parmer/romstage.c | 1 +
src/mainboard/amd/persimmon/romstage.c | 1 +
src/mainboard/amd/thatcher/romstage.c | 1 +
src/mainboard/asrock/imb-a180/romstage.c | 1 +
src/mainboard/asus/f2a85-m/romstage.c | 1 +
src/mainboard/gizmosphere/gizmo/romstage.c | 1 +
src/mainboard/hp/pavilion_m6_1035dx/romstage.c | 1 +
src/mainboard/jetway/nf81-t56n-lf/romstage.c | 1 +
src/mainboard/lippert/frontrunner-af/romstage.c | 1 +
src/mainboard/lippert/toucan-af/romstage.c | 1 +
src/southbridge/amd/agesa/hudson/hudson.h | 2 --
src/southbridge/amd/cimx/sb800/sb_cimx.h | 2 --
14 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 362e1c0..226957d 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -560,6 +560,8 @@ extern u8 acpi_slp_type;
int acpi_is_wakeup(void);
int acpi_is_wakeup_s3(void);
+int acpi_is_wakeup_early(void);
+
void acpi_fail_wakeup(void);
void acpi_resume(void *wake_vec);
void __attribute__((weak)) mainboard_suspend_resume(void);
@@ -591,6 +593,7 @@ static inline int acpi_s3_resume_allowed(void)
#define acpi_slp_type 0
static inline int acpi_is_wakeup(void) { return 0; }
static inline int acpi_is_wakeup_s3(void) { return 0; }
+static inline int acpi_is_wakeup_early(void) { return 0; }
#endif
#endif /* __ASM_ACPI_H */
diff --git a/src/mainboard/amd/olivehill/romstage.c b/src/mainboard/amd/olivehill/romstage.c
index 73cd40a..07f295d 100644
--- a/src/mainboard/amd/olivehill/romstage.c
+++ b/src/mainboard/amd/olivehill/romstage.c
@@ -22,6 +22,7 @@
#include <device/pci_def.h>
#include <device/pci_ids.h>
#include <arch/io.h>
+#include <arch/acpi.h>
#include <arch/stages.h>
#include <device/pnp_def.h>
#include <arch/cpu.h>
diff --git a/src/mainboard/amd/parmer/romstage.c b/src/mainboard/amd/parmer/romstage.c
index 668dfc8..5236692 100644
--- a/src/mainboard/amd/parmer/romstage.c
+++ b/src/mainboard/amd/parmer/romstage.c
@@ -22,6 +22,7 @@
#include <device/pci_def.h>
#include <device/pci_ids.h>
#include <arch/io.h>
+#include <arch/acpi.h>
#include <arch/stages.h>
#include <device/pnp_def.h>
#include <arch/cpu.h>
diff --git a/src/mainboard/amd/persimmon/romstage.c b/src/mainboard/amd/persimmon/romstage.c
index 9ba34e7..1108b68 100644
--- a/src/mainboard/amd/persimmon/romstage.c
+++ b/src/mainboard/amd/persimmon/romstage.c
@@ -22,6 +22,7 @@
#include <device/pci_def.h>
#include <device/pci_ids.h>
#include <arch/io.h>
+#include <arch/acpi.h>
#include <arch/stages.h>
#include <device/pnp_def.h>
#include <arch/cpu.h>
diff --git a/src/mainboard/amd/thatcher/romstage.c b/src/mainboard/amd/thatcher/romstage.c
index 1a7a399..c54f4f2 100644
--- a/src/mainboard/amd/thatcher/romstage.c
+++ b/src/mainboard/amd/thatcher/romstage.c
@@ -22,6 +22,7 @@
#include <device/pci_def.h>
#include <device/pci_ids.h>
#include <arch/io.h>
+#include <arch/acpi.h>
#include <arch/stages.h>
#include <device/pnp_def.h>
#include <arch/cpu.h>
diff --git a/src/mainboard/asrock/imb-a180/romstage.c b/src/mainboard/asrock/imb-a180/romstage.c
index 8ce496b..af30547 100644
--- a/src/mainboard/asrock/imb-a180/romstage.c
+++ b/src/mainboard/asrock/imb-a180/romstage.c
@@ -22,6 +22,7 @@
#include <device/pci_def.h>
#include <device/pci_ids.h>
#include <arch/io.h>
+#include <arch/acpi.h>
#include <arch/stages.h>
#include <device/pnp_def.h>
#include <arch/cpu.h>
diff --git a/src/mainboard/asus/f2a85-m/romstage.c b/src/mainboard/asus/f2a85-m/romstage.c
index 3884e36..e5e171a 100644
--- a/src/mainboard/asus/f2a85-m/romstage.c
+++ b/src/mainboard/asus/f2a85-m/romstage.c
@@ -22,6 +22,7 @@
#include <arch/cpu.h>
#include <arch/io.h>
+#include <arch/acpi.h>
#include <arch/stages.h>
#include <cbmem.h>
#include <console/console.h>
diff --git a/src/mainboard/gizmosphere/gizmo/romstage.c b/src/mainboard/gizmosphere/gizmo/romstage.c
index 11ae623..575155c 100755
--- a/src/mainboard/gizmosphere/gizmo/romstage.c
+++ b/src/mainboard/gizmosphere/gizmo/romstage.c
@@ -26,6 +26,7 @@
#include <arch/stages.h>
#include <device/pnp_def.h>
#include <arch/cpu.h>
+#include <arch/acpi.h>
#include <cpu/x86/lapic.h>
#include <console/console.h>
#include <console/loglevel.h>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/romstage.c b/src/mainboard/hp/pavilion_m6_1035dx/romstage.c
index 2be2bc5..cb4268c 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/romstage.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/romstage.c
@@ -19,6 +19,7 @@
#include "agesawrapper.h"
+#include <arch/acpi.h>
#include <arch/cpu.h>
#include <arch/io.h>
#include <arch/stages.h>
diff --git a/src/mainboard/jetway/nf81-t56n-lf/romstage.c b/src/mainboard/jetway/nf81-t56n-lf/romstage.c
index bfd24cb..25459d7 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/romstage.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/romstage.c
@@ -20,6 +20,7 @@
#include "agesawrapper.h"
+#include <arch/acpi.h>
#include <arch/cpu.h>
#include <arch/io.h>
#include <arch/stages.h>
diff --git a/src/mainboard/lippert/frontrunner-af/romstage.c b/src/mainboard/lippert/frontrunner-af/romstage.c
index 7146c01..01be8cd 100644
--- a/src/mainboard/lippert/frontrunner-af/romstage.c
+++ b/src/mainboard/lippert/frontrunner-af/romstage.c
@@ -22,6 +22,7 @@
#include <device/pci_def.h>
#include <device/pci_ids.h>
#include <arch/io.h>
+#include <arch/acpi.h>
#include <arch/stages.h>
#include <device/pnp_def.h>
#include <arch/cpu.h>
diff --git a/src/mainboard/lippert/toucan-af/romstage.c b/src/mainboard/lippert/toucan-af/romstage.c
index accf381..57c9015 100644
--- a/src/mainboard/lippert/toucan-af/romstage.c
+++ b/src/mainboard/lippert/toucan-af/romstage.c
@@ -22,6 +22,7 @@
#include <device/pci_def.h>
#include <device/pci_ids.h>
#include <arch/io.h>
+#include <arch/acpi.h>
#include <arch/stages.h>
#include <device/pnp_def.h>
#include <arch/cpu.h>
diff --git a/src/southbridge/amd/agesa/hudson/hudson.h b/src/southbridge/amd/agesa/hudson/hudson.h
index 50f1738..f67af05 100644
--- a/src/southbridge/amd/agesa/hudson/hudson.h
+++ b/src/southbridge/amd/agesa/hudson/hudson.h
@@ -70,8 +70,6 @@ void hudson_clk_output_48Mhz(void);
int s3_save_nvram_early(u32 dword, int size, int nvram_pos);
int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos);
-int acpi_is_wakeup_early(void);
-
#else
void hudson_enable(device_t dev);
void __attribute__((weak)) hudson_setup_sata_phys(struct device *dev);
diff --git a/src/southbridge/amd/cimx/sb800/sb_cimx.h b/src/southbridge/amd/cimx/sb800/sb_cimx.h
index 6267e1c..cd8c42b 100644
--- a/src/southbridge/amd/cimx/sb800/sb_cimx.h
+++ b/src/southbridge/amd/cimx/sb800/sb_cimx.h
@@ -32,8 +32,6 @@ void sb_Late_Post(void);
void sb_Before_Pci_Restore_Init(void);
void sb_After_Pci_Restore_Init(void);
-int acpi_is_wakeup_early(void);
-
/**
* CIMX not set the clock to 48Mhz until sbBeforePciInit,
* coreboot may need to set this even more earlier
More information about the coreboot-gerrit
mailing list