diff options
| author | Subrata Banik <subrata.banik@intel.com> | 2019-05-15 20:27:04 +0530 |
|---|---|---|
| committer | Subrata Banik <subrata.banik@intel.com> | 2019-06-24 04:33:06 +0000 |
| commit | 42c44c2f8391a3b56acf9215044d2b2787061738 (patch) | |
| tree | 54b57668d334901331c3a48182e59ee29d3ccd75 /src/include | |
| parent | e56fb89e7c04655ec0fed36484d9e509e08f662f (diff) | |
| download | coreboot-42c44c2f8391a3b56acf9215044d2b2787061738.tar.gz coreboot-42c44c2f8391a3b56acf9215044d2b2787061738.tar.bz2 coreboot-42c44c2f8391a3b56acf9215044d2b2787061738.zip | |
Replace ENV_RAMSTAGE with ENV_PAYLOAD_LOADER
This patch relying on new rule, ENV_PAYLOAD_LOADER which is set
to ENV_RAMSTAGE.
This approach will help to add future optimization (rampayload) in
coreboot flow if required.
Change-Id: Ib54ece7b9e5f281f8a092dc6f38c07406edfa5fa
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32725
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: ron minnich <rminnich@gmail.com>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/memlayout.h | 8 | ||||
| -rw-r--r-- | src/include/rules.h | 2 | ||||
| -rw-r--r-- | src/include/stddef.h | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/include/memlayout.h b/src/include/memlayout.h index 273a80d24011..1ed87b61c92d 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 fcb827df90e6..d8f6e7438bb1 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 993d5f09cc4c..7cae2e6dc89c 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 |