summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2022-05-12 18:01:13 +0200
committerJulius Werner <jwerner@chromium.org>2022-05-16 21:52:22 +0000
commit6acc05ed310fcd81bea9288df8c4cb4471a8bbbe (patch)
treed5a360b1cb9d34d75ac279ce18e474cc64bbc9c4 /src/lib
parent94223c41657fa604ff75ce2790504765c8a04713 (diff)
rules.h: Use more consistent naming
Use 'ENV' consistently and drop the redundant 'STAGE' in the naming. Change-Id: I51f2a7e70eefad12aa214e92f23e5fd2edf46698 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/64296 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Raul Rangel <rrangel@chromium.org>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/cbfs.c4
-rw-r--r--src/lib/program.ld4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index c8ca14caef..8c75273b98 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -19,7 +19,7 @@
#include <thread.h>
#include <timestamp.h>
-#if ENV_STAGE_HAS_DATA_SECTION
+#if ENV_HAS_DATA_SECTION
struct mem_pool cbfs_cache =
MEM_POOL_INIT(_cbfs_cache, REGION_SIZE(cbfs_cache), CONFIG_CBFS_CACHE_ALIGN);
#else
@@ -363,7 +363,7 @@ static enum cb_err get_preload_rdev(struct region_device *rdev, const char *name
enum cb_err err;
struct cbfs_preload_context *context;
- if (!CONFIG(CBFS_PRELOAD) || !ENV_STAGE_SUPPORTS_COOP)
+ if (!CONFIG(CBFS_PRELOAD) || !ENV_SUPPORTS_COOP)
return CB_ERR_ARG;
context = find_cbfs_preload_context(name);
diff --git a/src/lib/program.ld b/src/lib/program.ld
index 1c5cda40e1..a6d62cb554 100644
--- a/src/lib/program.ld
+++ b/src/lib/program.ld
@@ -72,7 +72,7 @@
#endif
/* Include data, bss, and heap in that order. Not defined for all stages. */
-#if ENV_STAGE_HAS_DATA_SECTION
+#if ENV_HAS_DATA_SECTION
.data . : {
. = ALIGN(ARCH_CACHELINE_ALIGN_SIZE);
_data = .;
@@ -130,7 +130,7 @@
}
#endif
-#if ENV_STAGE_HAS_HEAP_SECTION
+#if ENV_HAS_HEAP_SECTION
.heap . : {
. = ALIGN(ARCH_POINTER_ALIGN_SIZE);
_heap = .;