From a969ed34dbaebc595e298f60810669f0e8a3bcd2 Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Wed, 15 Jun 2016 06:08:15 +0300
Subject: Move definitions of HIGH_MEMORY_SAVE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is more of ACPI S3 resume and x86 definition than CBMEM.

Change-Id: Iffbfb2e30ab5ea0b736e5626f51c86c7452f3129
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/15190
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
---
 src/arch/x86/include/arch/acpi.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/arch/x86/include')

diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 276ca5210d..5674c3a240 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -24,6 +24,14 @@
 #ifndef __ASM_ACPI_H
 #define __ASM_ACPI_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
+
+#ifndef __ASSEMBLER__
 #include <stdint.h>
 #include <rules.h>
 #include <commonlib/helpers.h>
@@ -643,4 +651,6 @@ static inline uintptr_t acpi_align_current(uintptr_t current)
 	return ALIGN(current, 16);
 }
 
+#endif  /* __ASSEMBLER__ */
+
 #endif  /* __ASM_ACPI_H */
-- 
cgit v1.2.3