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/x86/include | |
parent | b3a8cc54dbaf833c590a56f912209a5632b71f49 (diff) |
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/x86/include')
-rw-r--r-- | src/arch/x86/include/arch/acpi.h | 14 | ||||
-rw-r--r-- | src/arch/x86/include/arch/cpu.h | 2 | ||||
-rw-r--r-- | src/arch/x86/include/arch/early_variables.h | 4 | ||||
-rw-r--r-- | src/arch/x86/include/arch/exception.h | 2 | ||||
-rw-r--r-- | src/arch/x86/include/arch/interrupt.h | 4 | ||||
-rw-r--r-- | src/arch/x86/include/arch/pci_io_cfg.h | 4 | ||||
-rw-r--r-- | src/arch/x86/include/arch/registers.h | 2 | ||||
-rw-r--r-- | src/arch/x86/include/arch/smp/spinlock.h | 6 | ||||
-rw-r--r-- | src/arch/x86/include/cf9_reset.h | 2 |
9 files changed, 20 insertions, 20 deletions
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 63f3045ee0..f4ed7440c5 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -32,7 +32,7 @@ * The type and enable fields are common in ACPI, but the * values themselves are hardware implementation defined. */ -#if IS_ENABLED(CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES) +#if CONFIG(ACPI_INTEL_HARDWARE_SLEEP_VALUES) #define SLP_EN (1 << 13) #define SLP_TYP_SHIFT 10 #define SLP_TYP (7 << SLP_TYP_SHIFT) @@ -41,7 +41,7 @@ #define SLP_TYP_S3 5 #define SLP_TYP_S4 6 #define SLP_TYP_S5 7 -#elif IS_ENABLED(CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES) +#elif CONFIG(ACPI_AMD_HARDWARE_SLEEP_VALUES) #define SLP_EN (1 << 13) #define SLP_TYP_SHIFT 10 #define SLP_TYP (7 << SLP_TYP_SHIFT) @@ -776,7 +776,7 @@ unsigned long acpi_fill_ivrs_ioapic(acpi_ivrs_t *ivrs, unsigned long current); void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id); void acpi_write_bert(acpi_bert_t *bert, uintptr_t region, size_t length); void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt); -#if IS_ENABLED(CONFIG_COMMON_FADT) +#if CONFIG(COMMON_FADT) void acpi_fill_fadt(acpi_fadt_t *fadt); #endif @@ -885,8 +885,8 @@ enum { ACPI_S5, }; -#if IS_ENABLED(CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES) \ - || IS_ENABLED(CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES) +#if CONFIG(ACPI_INTEL_HARDWARE_SLEEP_VALUES) \ + || CONFIG(ACPI_AMD_HARDWARE_SLEEP_VALUES) /* Given the provided PM1 control register return the ACPI sleep type. */ static inline int acpi_sleep_from_pm1(uint32_t pm1_cnt) { @@ -909,7 +909,7 @@ int acpi_get_gpe(int gpe); static inline int acpi_s3_resume_allowed(void) { - return IS_ENABLED(CONFIG_HAVE_ACPI_RESUME); + return CONFIG(HAVE_ACPI_RESUME); } /* Return address in reserved memory where to backup low memory @@ -919,7 +919,7 @@ static inline int acpi_s3_resume_allowed(void) */ void *acpi_backup_container(uintptr_t base, size_t size); -#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) +#if CONFIG(HAVE_ACPI_RESUME) #ifdef __PRE_RAM__ static inline int acpi_is_wakeup_s3(void) diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h index 3ee5cea761..b40dd1bc9e 100644 --- a/src/arch/x86/include/arch/cpu.h +++ b/src/arch/x86/include/arch/cpu.h @@ -188,7 +188,7 @@ struct thread; struct cpu_info { struct device *cpu; unsigned int index; -#if IS_ENABLED(CONFIG_COOP_MULTITASKING) +#if CONFIG(COOP_MULTITASKING) struct thread *thread; #endif }; diff --git a/src/arch/x86/include/arch/early_variables.h b/src/arch/x86/include/arch/early_variables.h index 2b74544d5c..9ea1537d81 100644 --- a/src/arch/x86/include/arch/early_variables.h +++ b/src/arch/x86/include/arch/early_variables.h @@ -19,7 +19,7 @@ #include <arch/symbols.h> #include <stdlib.h> -#if ENV_CACHE_AS_RAM && !IS_ENABLED(CONFIG_NO_CAR_GLOBAL_MIGRATION) +#if ENV_CACHE_AS_RAM && !CONFIG(NO_CAR_GLOBAL_MIGRATION) asm(".section .car.global_data,\"w\",@nobits"); asm(".previous"); #ifdef __clang__ @@ -100,6 +100,6 @@ static inline int car_active(void) { return 0; } #define car_get_var(var) (var) #define car_sync_var(var) (var) #define car_set_var(var, val) (var) = (val) -#endif /* ENV_CACHE_AS_RAM && !IS_ENABLED(CONFIG_NO_CAR_GLOBAL_MIGRATION) */ +#endif /* ENV_CACHE_AS_RAM && !CONFIG(NO_CAR_GLOBAL_MIGRATION) */ #endif /* ARCH_EARLY_VARIABLES_H */ diff --git a/src/arch/x86/include/arch/exception.h b/src/arch/x86/include/arch/exception.h index 08aedef797..d71d5a51f4 100644 --- a/src/arch/x86/include/arch/exception.h +++ b/src/arch/x86/include/arch/exception.h @@ -32,7 +32,7 @@ #include <arch/cpu.h> -#if IS_ENABLED(CONFIG_IDT_IN_EVERY_STAGE) || ENV_RAMSTAGE +#if CONFIG(IDT_IN_EVERY_STAGE) || ENV_RAMSTAGE asmlinkage void exception_init(void); #else static inline void exception_init(void) { /* not implemented */ } diff --git a/src/arch/x86/include/arch/interrupt.h b/src/arch/x86/include/arch/interrupt.h index 3373e8223b..086e5bc8f2 100644 --- a/src/arch/x86/include/arch/interrupt.h +++ b/src/arch/x86/include/arch/interrupt.h @@ -21,9 +21,9 @@ #include "registers.h" /* setup interrupt handlers for mainboard */ -#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) +#if CONFIG(PCI_OPTION_ROM_RUN_REALMODE) extern void mainboard_interrupt_handlers(int intXX, int (*intXX_func)(void)); -#elif IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL) +#elif CONFIG(PCI_OPTION_ROM_RUN_YABEL) #include <device/oprom/yabel/biosemu.h> #else static inline void mainboard_interrupt_handlers(int intXX, diff --git a/src/arch/x86/include/arch/pci_io_cfg.h b/src/arch/x86/include/arch/pci_io_cfg.h index 3e2129fa1a..017e661f14 100644 --- a/src/arch/x86/include/arch/pci_io_cfg.h +++ b/src/arch/x86/include/arch/pci_io_cfg.h @@ -21,7 +21,7 @@ static __always_inline unsigned int pci_io_encode_addr(pci_devfn_t dev, unsigned int where) { - if (IS_ENABLED(CONFIG_PCI_IO_CFG_EXT)) { + if (CONFIG(PCI_IO_CFG_EXT)) { // seg == 0 return dev >> 4 | (where & 0xff) | ((where & 0xf00) << 16); } else { @@ -77,7 +77,7 @@ void pci_io_write_config32(pci_devfn_t dev, unsigned int where, uint32_t value) outl(value, 0xCFC); } -#if !IS_ENABLED(CONFIG_MMCONF_SUPPORT) +#if !CONFIG(MMCONF_SUPPORT) /* Avoid name collisions as different stages have different signature * for these functions. The _s_ stands for simple, fundamental IO or diff --git a/src/arch/x86/include/arch/registers.h b/src/arch/x86/include/arch/registers.h index 1d3b90aa93..41275a8dc2 100644 --- a/src/arch/x86/include/arch/registers.h +++ b/src/arch/x86/include/arch/registers.h @@ -60,7 +60,7 @@ struct eregs { }; #endif // !ASSEMBLER -#if IS_ENABLED(CONFIG_COMPILER_LLVM_CLANG) +#if CONFIG(COMPILER_LLVM_CLANG) #define ADDR32(opcode) opcode #else #define ADDR32(opcode) addr32 opcode diff --git a/src/arch/x86/include/arch/smp/spinlock.h b/src/arch/x86/include/arch/smp/spinlock.h index 183d726d19..f9186787af 100644 --- a/src/arch/x86/include/arch/smp/spinlock.h +++ b/src/arch/x86/include/arch/smp/spinlock.h @@ -15,9 +15,9 @@ #define ARCH_SMP_SPINLOCK_H #if !defined(__PRE_RAM__) \ - || IS_ENABLED(CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK) \ - || IS_ENABLED(CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK) \ - || IS_ENABLED(CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK) + || CONFIG(HAVE_ROMSTAGE_CONSOLE_SPINLOCK) \ + || CONFIG(HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK) \ + || CONFIG(HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK) /* * Your basic SMP spinlocks, allowing only a single CPU anywhere diff --git a/src/arch/x86/include/cf9_reset.h b/src/arch/x86/include/cf9_reset.h index c0dcc92bd1..7b44e0f2a6 100644 --- a/src/arch/x86/include/cf9_reset.h +++ b/src/arch/x86/include/cf9_reset.h @@ -27,7 +27,7 @@ void do_system_reset(void); void do_full_reset(void); /* Called by functions below before reset. */ -#if IS_ENABLED(CONFIG_HAVE_CF9_RESET_PREPARE) +#if CONFIG(HAVE_CF9_RESET_PREPARE) void cf9_reset_prepare(void); #else static inline void cf9_reset_prepare(void) {} |