summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/cbmem.h23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index beb626b9dc..e88c2f71af 100644
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -21,11 +21,18 @@
#ifndef _CBMEM_H_
#define _CBMEM_H_
-#if CONFIG_HAVE_ACPI_RESUME
-#if CONFIG_RELOCATABLE_RAMSTAGE
+#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
+
+#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) && \
+ IS_ENABLED(CONFIG_HIGH_SCRATCH_MEMORY_SIZE)
+#define HIGH_MEMORY_SCRATCH CONFIG_HIGH_SCRATCH_MEMORY_SIZE
#else
-#define HIGH_MEMORY_SAVE (CONFIG_RAMTOP - CONFIG_RAMBASE)
+#define HIGH_MEMORY_SCRATCH 0
#endif
/* Delegation of resume backup memory so we don't have to
@@ -33,7 +40,6 @@
*/
#define CBMEM_BOOT_MODE 0x610
#define CBMEM_RESUME_BACKUP 0x614
-#endif /* CONFIG_HAVE_ACPI_RESUME */
#define CBMEM_ID_FREESPACE 0x46524545
#define CBMEM_ID_GDT 0x4c474454
@@ -133,14 +139,9 @@ u64 cbmem_entry_size(const struct cbmem_entry *entry);
*/
#define _CBMEM_SZ_MINIMAL ( 128 * 1024 )
-#if CONFIG_HAVE_ACPI_RESUME
-#define _CBMEM_SZ_RESUME (HIGH_MEMORY_SAVE + CONFIG_HIGH_SCRATCH_MEMORY_SIZE)
-#else
-#define _CBMEM_SZ_RESUME 0
-#endif
-
#define _CBMEM_SZ_TOTAL \
- (_CBMEM_SZ_MINIMAL + _CBMEM_SZ_RESUME + CONFIG_CONSOLE_CBMEM_BUFFER_SIZE)
+ (_CBMEM_SZ_MINIMAL + CONFIG_CONSOLE_CBMEM_BUFFER_SIZE + \
+ HIGH_MEMORY_SAVE + HIGH_MEMORY_SCRATCH)
#define HIGH_MEMORY_SIZE ALIGN_UP(_CBMEM_SZ_TOTAL, 0x10000)