diff options
| author | Julius Werner <jwerner@chromium.org> | 2019-03-05 16:53:33 -0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-03-08 08:33:24 +0000 |
| commit | cd49cce7b70e80b4acc49b56bb2bb94370b4d867 (patch) | |
| tree | 8e89136e2da7cf54453ba8c112eda94415b56242 /src/arch/arm64 | |
| parent | b3a8cc54dbaf833c590a56f912209a5632b71f49 (diff) | |
| download | coreboot-cd49cce7b70e80b4acc49b56bb2bb94370b4d867.tar.xz | |
coreboot: Replace all IS_ENABLED(CONFIG_XXX) with CONFIG(XXX)
This patch is a raw application of
find src/ -type f | xargs sed -i -e 's/IS_ENABLED\s*(CONFIG_/CONFIG(/g'
Change-Id: I6262d6d5c23cabe23c242b4f38d446b74fe16b88
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31774
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/arch/arm64')
| -rw-r--r-- | src/arch/arm64/arm_tf.c | 2 | ||||
| -rw-r--r-- | src/arch/arm64/armv8/exception.c | 2 | ||||
| -rw-r--r-- | src/arch/arm64/boot.c | 2 | ||||
| -rw-r--r-- | src/arch/arm64/include/armv8/arch/barrier.h | 2 | ||||
| -rw-r--r-- | src/arch/arm64/tables.c | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/arch/arm64/arm_tf.c b/src/arch/arm64/arm_tf.c index 3f1aa2a265..7cf173b5bb 100644 --- a/src/arch/arm64/arm_tf.c +++ b/src/arch/arm64/arm_tf.c @@ -56,7 +56,7 @@ void arm_tf_run_bl31(u64 payload_entry, u64 payload_arg0, u64 payload_spsr) SET_PARAM_HEAD(&bl31_params, PARAM_BL31, VERSION_1, 0); - if (IS_ENABLED(CONFIG_ARM64_USE_SECURE_OS)) { + if (CONFIG(ARM64_USE_SECURE_OS)) { struct prog bl32 = PROG_INIT(PROG_BL32, CONFIG_CBFS_PREFIX"/secure_os"); diff --git a/src/arch/arm64/armv8/exception.c b/src/arch/arm64/armv8/exception.c index e32c79a85a..58a35238f6 100644 --- a/src/arch/arm64/armv8/exception.c +++ b/src/arch/arm64/armv8/exception.c @@ -220,7 +220,7 @@ void exception_init(void) printk(BIOS_DEBUG, "ARM64: Exception handlers installed.\n"); /* Only spend time testing on debug builds that are trying to detect more errors. */ - if (IS_ENABLED(CONFIG_FATAL_ASSERTS)) { + if (CONFIG(FATAL_ASSERTS)) { printk(BIOS_DEBUG, "ARM64: Testing exception\n"); test_exception(); printk(BIOS_DEBUG, "ARM64: Done test exception\n"); diff --git a/src/arch/arm64/boot.c b/src/arch/arm64/boot.c index c2119f3890..fefc0d305e 100644 --- a/src/arch/arm64/boot.c +++ b/src/arch/arm64/boot.c @@ -30,7 +30,7 @@ static void run_payload(struct prog *prog) arg = prog_entry_arg(prog); u64 payload_spsr = get_eret_el(EL2, SPSR_USE_L); - if (IS_ENABLED(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE)) + if (CONFIG(ARM64_USE_ARM_TRUSTED_FIRMWARE)) arm_tf_run_bl31((u64)doit, (u64)arg, payload_spsr); else transition_to_el2(doit, arg, payload_spsr); diff --git a/src/arch/arm64/include/armv8/arch/barrier.h b/src/arch/arm64/include/armv8/arch/barrier.h index 397ac2aa67..3c3feb68d7 100644 --- a/src/arch/arm64/include/armv8/arch/barrier.h +++ b/src/arch/arm64/include/armv8/arch/barrier.h @@ -30,7 +30,7 @@ #define rmb() asm volatile("dsb ld" : : : "memory") #define wmb() asm volatile("dsb st" : : : "memory") -#if IS_ENABLED(CONFIG_SMP) +#if CONFIG(SMP) #define barrier() __asm__ __volatile__("": : :"memory") #endif diff --git a/src/arch/arm64/tables.c b/src/arch/arm64/tables.c index b0010c4b9e..492eadd764 100644 --- a/src/arch/arm64/tables.c +++ b/src/arch/arm64/tables.c @@ -30,12 +30,12 @@ void bootmem_arch_add_ranges(void) { bootmem_add_range((uintptr_t)_ttb, REGION_SIZE(ttb), BM_MEM_RAMSTAGE); - if (IS_ENABLED(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE) && + if (CONFIG(ARM64_USE_ARM_TRUSTED_FIRMWARE) && REGION_SIZE(bl31) > 0) bootmem_add_range((uintptr_t)_bl31, REGION_SIZE(bl31), BM_MEM_BL31); - if (!IS_ENABLED(CONFIG_COMMON_CBFS_SPI_WRAPPER)) + if (!CONFIG(COMMON_CBFS_SPI_WRAPPER)) return; bootmem_add_range((uintptr_t)_postram_cbfs_cache, REGION_SIZE(postram_cbfs_cache), BM_MEM_RAMSTAGE); |