diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-06-08 06:05:03 +0300 |
|---|---|---|
| committer | Angel Pons <th3fanbus@gmail.com> | 2020-06-17 21:13:09 +0000 |
| commit | 7336f97debc883d293e4d5f942c556d1f8931842 (patch) | |
| tree | ccce5515be8a082f964a5c309d89468776a1bc96 /src/include | |
| parent | 5edbb1c5d917ae27aa8c869a92f3f8750dea9845 (diff) | |
treewide: Replace CONFIG(ARCH_xx) tests
Once we support building stages for different architectures,
such CONFIG(ARCH_xx) tests do not evaluate correctly anymore.
Change-Id: I599995b3ed5c4dfd578c87067fe8bfc8c75b9d43
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42183
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
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 */ |