summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/memlayout.h8
-rw-r--r--src/include/rules.h2
-rw-r--r--src/include/stddef.h2
3 files changed, 8 insertions, 4 deletions
diff --git a/src/include/memlayout.h b/src/include/memlayout.h
index 273a80d240..1ed87b61c9 100644
--- a/src/include/memlayout.h
+++ b/src/include/memlayout.h
@@ -39,9 +39,13 @@
#define ARCH_STAGE_HAS_BSS_SECTION 1
#endif
-/* Default is that currently ramstage, smm, and rmodules have a heap. */
+/*
+ * Default is that currently ENV_PAYLOAD_LOADER enable stage, smm,
+ * and rmodules have a heap.
+ */
#ifndef ARCH_STAGE_HAS_HEAP_SECTION
-#define ARCH_STAGE_HAS_HEAP_SECTION (ENV_RAMSTAGE || ENV_SMM || ENV_RMODULE)
+#define ARCH_STAGE_HAS_HEAP_SECTION (ENV_PAYLOAD_LOADER || ENV_SMM || \
+ ENV_RMODULE)
#endif
#define STR(x) #x
diff --git a/src/include/rules.h b/src/include/rules.h
index fcb827df90..d8f6e7438b 100644
--- a/src/include/rules.h
+++ b/src/include/rules.h
@@ -277,7 +277,7 @@
* be built with simple device model.
*/
-#if (defined(__PRE_RAM__) || ENV_SMM || ENV_POSTCAR)
+#if (defined(__PRE_RAM__) || ENV_SMM || !ENV_PAYLOAD_LOADER)
#define __SIMPLE_DEVICE__
#endif
diff --git a/src/include/stddef.h b/src/include/stddef.h
index 993d5f09cc..7cae2e6dc8 100644
--- a/src/include/stddef.h
+++ b/src/include/stddef.h
@@ -23,7 +23,7 @@ typedef unsigned int wint_t;
/* The devicetree data structures are only mutable in ramstage. All other
stages have a constant devicetree. */
-#if !ENV_RAMSTAGE
+#if !ENV_PAYLOAD_LOADER
#define DEVTREE_EARLY 1
#else
#define DEVTREE_EARLY 0