[coreboot-gerrit] New patch to review for coreboot: Move definitions of HIGH_MEMORY_SAVE

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15190

-gerrit

commit 278da3658a7bd1d356ecad68b5ab6700c2d27b57
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Wed Jun 15 02:36:26 2016 +0300

    Move definitions of HIGH_MEMORY_SAVE
    
    This is more of ACPI S3 resume and x86 definition than CBMEM.
    
    Change-Id: Iffbfb2e30ab5ea0b736e5626f51c86c7452f3129
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/arch/x86/include/arch/acpi.h | 7 +++++++
 src/include/cbmem.h              | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 276ca52..fd8b0f4 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -631,8 +631,15 @@ int acpi_is_wakeup_s3(void);
 int acpi_is_wakeup_s4(void);
 #endif
 
+#if !IS_ENABLED(CONFIG_RELOCATABLE_RAMSTAGE)
+#define HIGH_MEMORY_SAVE	(CONFIG_RAMTOP - CONFIG_RAMBASE)
+#else
+#define HIGH_MEMORY_SAVE	0
+#endif
+
 #else
 #define acpi_slp_type 0
+#define HIGH_MEMORY_SAVE 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_s4(void) { return 0; }
diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index 524bfb5..35e2dea 100644
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -20,13 +20,6 @@
 #include <commonlib/cbmem_id.h>
 #include <rules.h>
 
-#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) && \
-	! IS_ENABLED(CONFIG_RELOCATABLE_RAMSTAGE)
-#define HIGH_MEMORY_SAVE	(CONFIG_RAMTOP - CONFIG_RAMBASE)
-#else
-#define HIGH_MEMORY_SAVE	0
-#endif
-
 /* Delegation of resume backup memory so we don't have to
  * (slowly) handle backing up OS memory in romstage.c
  */