diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/cbmem.h | 2 | ||||
| -rw-r--r-- | src/include/rules.h | 2 | ||||
| -rw-r--r-- | src/include/symbols.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/include/cbmem.h b/src/include/cbmem.h index f88cfb7b7e..4cc4045055 100644 --- a/src/include/cbmem.h +++ b/src/include/cbmem.h @@ -145,7 +145,7 @@ void cbmem_add_records_to_cbtable(struct lb_header *header); * and CBMEM_CONSOLE. Sometimes it is necessary to have cbmem_top() * value stored in nvram to enable early recovery on S3 path. */ -#if CONFIG(ARCH_X86) +#if ENV_X86 void backup_top_of_low_cacheable(uintptr_t ramtop); uintptr_t restore_top_of_low_cacheable(void); #endif diff --git a/src/include/rules.h b/src/include/rules.h index 1ab603bdbc..160829efa4 100644 --- a/src/include/rules.h +++ b/src/include/rules.h @@ -247,7 +247,7 @@ (ENV_DECOMPRESSOR || ENV_BOOTBLOCK || ENV_ROMSTAGE || \ (ENV_SEPARATE_VERSTAGE && !CONFIG(VBOOT_STARTS_IN_ROMSTAGE))) -#if CONFIG(ARCH_X86) +#if ENV_X86 /* 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. */ diff --git a/src/include/symbols.h b/src/include/symbols.h index 786486745f..f84672ed22 100644 --- a/src/include/symbols.h +++ b/src/include/symbols.h @@ -63,7 +63,7 @@ DECLARE_REGION(bl31) * (Does not necessarily mean that the memory is accessible.) */ static inline int preram_symbols_available(void) { - return !CONFIG(ARCH_X86) || ENV_ROMSTAGE_OR_BEFORE; + return !ENV_X86 || ENV_ROMSTAGE_OR_BEFORE; } #endif /* __SYMBOLS_H */ |