summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/drivers/elog/elog.c2
-rw-r--r--src/include/memlayout.h8
-rw-r--r--src/include/rules.h2
-rw-r--r--src/include/stddef.h2
-rw-r--r--src/lib/imd_cbmem.c2
-rw-r--r--src/lib/memrange.c2
-rw-r--r--src/lib/prog_loaders.c2
-rw-r--r--src/lib/timestamp.c11
-rw-r--r--src/soc/intel/common/block/fast_spi/fast_spi.c2
-rw-r--r--src/soc/intel/common/block/i2c/i2c.c2
-rw-r--r--src/soc/intel/common/block/lpc/lpc_lib.c2
11 files changed, 22 insertions, 15 deletions
diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c
index e41b55bba5..9ac2d3c095 100644
--- a/src/drivers/elog/elog.c
+++ b/src/drivers/elog/elog.c
@@ -859,7 +859,7 @@ int elog_init(void)
" shrink size %d\n", region_device_sz(&es->nv_dev),
es->full_threshold, es->shrink_size);
- if (ENV_RAMSTAGE)
+ if (ENV_PAYLOAD_LOADER)
elog_add_boot_count();
return 0;
}
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
diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c
index 1a67ad5be1..b1b63f68b3 100644
--- a/src/lib/imd_cbmem.c
+++ b/src/lib/imd_cbmem.c
@@ -307,7 +307,7 @@ void cbmem_get_region(void **baseptr, size_t *size)
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 96d7524218..79a1b0ee49 100644
--- a/src/lib/memrange.c
+++ b/src/lib/memrange.c
@@ -47,7 +47,7 @@ static struct range_entry *alloc_range(struct memranges *ranges)
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 81ec2ec3c4..dfabd31910 100644
--- a/src/lib/prog_loaders.c
+++ b/src/lib/prog_loaders.c
@@ -160,7 +160,7 @@ fail:
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 38d0212845..adacf6b1b3 100644
--- a/src/lib/timestamp.c
+++ b/src/lib/timestamp.c
@@ -116,8 +116,11 @@ static struct timestamp_table *timestamp_alloc_cbmem_table(void)
* 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 @@ static void timestamp_sync_cache_to_cbmem(int is_recovery)
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. */
diff --git a/src/soc/intel/common/block/fast_spi/fast_spi.c b/src/soc/intel/common/block/fast_spi/fast_spi.c
index 58e7db75a1..e40b84493e 100644
--- a/src/soc/intel/common/block/fast_spi/fast_spi.c
+++ b/src/soc/intel/common/block/fast_spi/fast_spi.c
@@ -249,7 +249,7 @@ void fast_spi_cache_bios_region(void)
bios_size = ALIGN_UP(bios_size, alignment);
base = 4ULL*GiB - bios_size;
- if (ENV_RAMSTAGE) {
+ if (ENV_PAYLOAD_LOADER) {
mtrr_use_temp_range(base, bios_size, type);
} else {
int mtrr = get_free_var_mtrr();
diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c
index a99dfea688..d551c51abf 100644
--- a/src/soc/intel/common/block/i2c/i2c.c
+++ b/src/soc/intel/common/block/i2c/i2c.c
@@ -47,7 +47,7 @@ uintptr_t dw_i2c_get_soc_early_base(unsigned int bus)
return EARLY_I2C_BASE(bus);
}
-#if !ENV_RAMSTAGE
+#if !ENV_PAYLOAD_LOADER
static int lpss_i2c_early_init_bus(unsigned int bus)
{
const struct dw_i2c_bus_config *config;
diff --git a/src/soc/intel/common/block/lpc/lpc_lib.c b/src/soc/intel/common/block/lpc/lpc_lib.c
index c67c43532c..b31c799a6a 100644
--- a/src/soc/intel/common/block/lpc/lpc_lib.c
+++ b/src/soc/intel/common/block/lpc/lpc_lib.c
@@ -289,7 +289,7 @@ void pch_enable_lpc(void)
soc_get_gen_io_dec_range(dev, gen_io_dec);
lpc_set_gen_decode_range(gen_io_dec);
soc_setup_dmi_pcr_io_dec(gen_io_dec);
- if (ENV_RAMSTAGE)
+ if (ENV_PAYLOAD_LOADER)
pch_lpc_interrupt_init();
}