diff options
| -rw-r--r-- | src/ec/acpi/ec.c | 2 | ||||
| -rw-r--r-- | src/include/rules.h | 18 | ||||
| -rw-r--r-- | src/include/smp/spinlock.h | 2 | ||||
| -rw-r--r-- | src/include/stddef.h | 2 | ||||
| -rw-r--r-- | src/include/thread.h | 2 | ||||
| -rw-r--r-- | src/lib/cbfs.c | 4 | ||||
| -rw-r--r-- | src/lib/program.ld | 4 | ||||
| -rw-r--r-- | src/vendorcode/cavium/bdk/libbdk-hal/bdk-config.c | 4 |
8 files changed, 19 insertions, 19 deletions
diff --git a/src/ec/acpi/ec.c b/src/ec/acpi/ec.c index 5d6fb189fb..76ec8fe2bd 100644 --- a/src/ec/acpi/ec.c +++ b/src/ec/acpi/ec.c @@ -142,7 +142,7 @@ void ec_clr_bit(u8 addr, u8 bit) void ec_set_ports(u16 cmd_reg, u16 data_reg) { - if (!ENV_STAGE_HAS_DATA_SECTION) + if (!ENV_HAS_DATA_SECTION) return; ec_cmd_reg = cmd_reg; diff --git a/src/include/rules.h b/src/include/rules.h index 02b55c5f8a..8ccfe28e66 100644 --- a/src/include/rules.h +++ b/src/include/rules.h @@ -268,15 +268,15 @@ /* Indicates memory layout is determined with arch/x86/car.ld. */ #define ENV_CACHE_AS_RAM (ENV_ROMSTAGE_OR_BEFORE && !CONFIG(RESET_VECTOR_IN_RAM)) /* No .data sections with execute-in-place from ROM. */ -#define ENV_STAGE_HAS_DATA_SECTION !ENV_CACHE_AS_RAM +#define ENV_HAS_DATA_SECTION !ENV_CACHE_AS_RAM #else /* Both .data and .bss, sometimes SRAM not DRAM. */ -#define ENV_STAGE_HAS_DATA_SECTION 1 +#define ENV_HAS_DATA_SECTION 1 #define ENV_CACHE_AS_RAM 0 #endif /* Currently rmodules, ramstage and smm have heap. */ -#define ENV_STAGE_HAS_HEAP_SECTION (ENV_RMODULE || ENV_RAMSTAGE || ENV_SMM) +#define ENV_HAS_HEAP_SECTION (ENV_RMODULE || ENV_RAMSTAGE || ENV_SMM) /* Set USER_SPACE in the makefile for the rare code that runs in userspace */ #if defined(__USER_SPACE__) @@ -293,21 +293,21 @@ #endif #if ENV_X86 -#define STAGE_HAS_SPINLOCKS !ENV_ROMSTAGE_OR_BEFORE +#define ENV_HAS_SPINLOCKS !ENV_ROMSTAGE_OR_BEFORE #elif ENV_RISCV -#define STAGE_HAS_SPINLOCKS 1 +#define ENV_HAS_SPINLOCKS 1 #else -#define STAGE_HAS_SPINLOCKS 0 +#define ENV_HAS_SPINLOCKS 0 #endif /* When set <arch/smp/spinlock.h> is included for the spinlock implementation. */ -#define ENV_STAGE_SUPPORTS_SMP (CONFIG(SMP) && STAGE_HAS_SPINLOCKS) +#define ENV_SUPPORTS_SMP (CONFIG(SMP) && ENV_HAS_SPINLOCKS) #if ENV_X86 && CONFIG(COOP_MULTITASKING) && (ENV_RAMSTAGE || ENV_ROMSTAGE) /* TODO: Enable in all x86 stages */ -#define ENV_STAGE_SUPPORTS_COOP 1 +#define ENV_SUPPORTS_COOP 1 #else -#define ENV_STAGE_SUPPORTS_COOP 0 +#define ENV_SUPPORTS_COOP 0 #endif /** diff --git a/src/include/smp/spinlock.h b/src/include/smp/spinlock.h index 116830cd74..0ca391d93c 100644 --- a/src/include/smp/spinlock.h +++ b/src/include/smp/spinlock.h @@ -1,7 +1,7 @@ #ifndef SMP_SPINLOCK_H #define SMP_SPINLOCK_H -#if ENV_STAGE_SUPPORTS_SMP +#if ENV_SUPPORTS_SMP #include <arch/smp/spinlock.h> #else /* !CONFIG_SMP */ diff --git a/src/include/stddef.h b/src/include/stddef.h index 190413c6a2..100368eddb 100644 --- a/src/include/stddef.h +++ b/src/include/stddef.h @@ -32,7 +32,7 @@ typedef __WINT_TYPE__ wint_t; #define DEVTREE_CONST #endif -#if ENV_STAGE_HAS_DATA_SECTION +#if ENV_HAS_DATA_SECTION #define MAYBE_STATIC_NONZERO static #else #define MAYBE_STATIC_NONZERO diff --git a/src/include/thread.h b/src/include/thread.h index f414db0281..059ba52a2c 100644 --- a/src/include/thread.h +++ b/src/include/thread.h @@ -37,7 +37,7 @@ int thread_run_until(struct thread_handle *handle, enum cb_err (*func)(void *), /* Waits until the thread has terminated and returns the error code */ enum cb_err thread_join(struct thread_handle *handle); -#if ENV_STAGE_SUPPORTS_COOP +#if ENV_SUPPORTS_COOP struct thread { int id; 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 = .; diff --git a/src/vendorcode/cavium/bdk/libbdk-hal/bdk-config.c b/src/vendorcode/cavium/bdk/libbdk-hal/bdk-config.c index 630403d44c..eec44434a5 100644 --- a/src/vendorcode/cavium/bdk/libbdk-hal/bdk-config.c +++ b/src/vendorcode/cavium/bdk/libbdk-hal/bdk-config.c @@ -47,7 +47,7 @@ static struct bdk_devicetree_key_value *bdk_config_duplicate( */ int bdk_config_set_fdt(const struct bdk_devicetree_key_value *fdt) { - if (ENV_STAGE_HAS_HEAP_SECTION) + if (ENV_HAS_HEAP_SECTION) config_fdt = bdk_config_duplicate(fdt, 0); else config_fdt = (void *)fdt; @@ -203,7 +203,7 @@ void bdk_config_set_int(int64_t value, bdk_config_t cfg_item, ...) /* Make sure the correct access function was called */ assert(config_info[cfg_item].ctype == BDK_CONFIG_TYPE_INT); - if (!ENV_STAGE_HAS_HEAP_SECTION) + if (!ENV_HAS_HEAP_SECTION) return; if (!config_fdt) |