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>
diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c
index 1a67ad5..b1b63f6 100644
--- a/src/lib/imd_cbmem.c
+++ b/src/lib/imd_cbmem.c
@@ -307,7 +307,7 @@
imd_region_used(cbmem_get_imd(), baseptr, size);
}
-#if ENV_RAMSTAGE || (CONFIG(EARLY_CBMEM_LIST) \
+#if ENV_PAYLOAD_LOADER || (CONFIG(EARLY_CBMEM_LIST) \
&& (ENV_POSTCAR || ENV_ROMSTAGE))
/*
* -fdata-sections doesn't work so well on read only strings. They all
diff --git a/src/lib/memrange.c b/src/lib/memrange.c
index 96d75242..79a1b0e 100644
--- a/src/lib/memrange.c
+++ b/src/lib/memrange.c
@@ -47,7 +47,7 @@
range_entry_unlink(&ranges->free_list, r);
return r;
}
- if (ENV_RAMSTAGE)
+ if (ENV_PAYLOAD_LOADER)
return malloc(sizeof(struct range_entry));
return NULL;
}
diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c
index 81ec2ec..dfabd31 100644
--- a/src/lib/prog_loaders.c
+++ b/src/lib/prog_loaders.c
@@ -160,7 +160,7 @@
die_with_post_code(POST_INVALID_ROM, "Ramstage was not loaded!\n");
}
-#ifdef __RAMSTAGE__ // gc-sections should take care of this
+#if ENV_PAYLOAD_LOADER // gc-sections should take care of this
static struct prog global_payload =
PROG_INIT(PROG_PAYLOAD, CONFIG_CBFS_PREFIX "/payload");
diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c
index 38d0212..adacf6b 100644
--- a/src/lib/timestamp.c
+++ b/src/lib/timestamp.c
@@ -116,8 +116,11 @@
* based x86 platforms. */
static int timestamp_should_run(void)
{
- /* Only check boot_cpu() in other stages than ramstage on x86. */
- if ((!ENV_RAMSTAGE && CONFIG(ARCH_X86)) && !boot_cpu())
+ /*
+ * Only check boot_cpu() in other stages than
+ * ENV_PAYLOAD_LOADER on x86.
+ */
+ if ((!ENV_PAYLOAD_LOADER && CONFIG(ARCH_X86)) && !boot_cpu())
return 0;
return 1;
@@ -302,8 +305,8 @@
if (ts_cbmem_table->base_time == 0)
ts_cbmem_table->base_time = ts_cache_table->base_time;
- /* Seed the timestamp tick frequency in ramstage. */
- if (ENV_RAMSTAGE)
+ /* Seed the timestamp tick frequency in ENV_PAYLOAD_LOADER. */
+ if (ENV_PAYLOAD_LOADER)
ts_cbmem_table->tick_freq_mhz = timestamp_tick_freq_mhz();
/* Cache no longer required. */