From cd49cce7b70e80b4acc49b56bb2bb94370b4d867 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Tue, 5 Mar 2019 16:53:33 -0800 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/31774 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/cpu/x86/smm/smihandler.c | 4 ++-- src/cpu/x86/smm/smm_module_handler.c | 6 +++--- src/cpu/x86/smm/smm_module_loader.c | 4 ++-- src/cpu/x86/smm/smmhandler.S | 4 ++-- src/cpu/x86/smm/smmrelocate.S | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/cpu/x86/smm') diff --git a/src/cpu/x86/smm/smihandler.c b/src/cpu/x86/smm/smihandler.c index 8c65cbd828..0ffa46537c 100644 --- a/src/cpu/x86/smm/smihandler.c +++ b/src/cpu/x86/smm/smihandler.c @@ -19,7 +19,7 @@ #include #include -#if IS_ENABLED(CONFIG_SPI_FLASH_SMM) +#if CONFIG(SPI_FLASH_SMM) #include #endif @@ -186,7 +186,7 @@ void smi_handler(u32 smm_revision) /* Allow drivers to initialize variables in SMM context. */ if (do_driver_init) { -#if IS_ENABLED(CONFIG_SPI_FLASH_SMM) +#if CONFIG(SPI_FLASH_SMM) spi_init(); #endif do_driver_init = 0; diff --git a/src/cpu/x86/smm/smm_module_handler.c b/src/cpu/x86/smm/smm_module_handler.c index f9af965208..0d9abc5763 100644 --- a/src/cpu/x86/smm/smm_module_handler.c +++ b/src/cpu/x86/smm/smm_module_handler.c @@ -18,7 +18,7 @@ #include #include -#if IS_ENABLED(CONFIG_SPI_FLASH_SMM) +#if CONFIG(SPI_FLASH_SMM) #include #endif @@ -161,7 +161,7 @@ asmlinkage void smm_handler_start(void *arg) /* Allow drivers to initialize variables in SMM context. */ if (do_driver_init) { -#if IS_ENABLED(CONFIG_SPI_FLASH_SMM) +#if CONFIG(SPI_FLASH_SMM) spi_init(); #endif do_driver_init = 0; @@ -180,7 +180,7 @@ asmlinkage void smm_handler_start(void *arg) expected_canary); // Don't die if we can't indicate an error. - if (IS_ENABLED(CONFIG_DEBUG_SMI)) + if (CONFIG(DEBUG_SMI)) die("SMM Handler caused a stack overflow\n"); } diff --git a/src/cpu/x86/smm/smm_module_loader.c b/src/cpu/x86/smm/smm_module_loader.c index 6c166454dc..80b2c27c79 100644 --- a/src/cpu/x86/smm/smm_module_loader.c +++ b/src/cpu/x86/smm/smm_module_loader.c @@ -346,7 +346,7 @@ int smm_load_module(void *smram, size_t size, struct smm_loader_params *params) return -1; /* Clear SMM region */ - if (IS_ENABLED(CONFIG_DEBUG_SMI)) + if (CONFIG(DEBUG_SMI)) memset(smram, 0xcd, size); total_stack_size = params->per_cpu_stack_size * @@ -370,7 +370,7 @@ int smm_load_module(void *smram, size_t size, struct smm_loader_params *params) base += alignment_size; } - if (IS_ENABLED(CONFIG_SSE)) { + if (CONFIG(SSE)) { fxsave_size = FXSAVE_SIZE * params->num_concurrent_stacks; /* FXSAVE area below all the stacks stack. */ fxsave_area = params->stack_top; diff --git a/src/cpu/x86/smm/smmhandler.S b/src/cpu/x86/smm/smmhandler.S index 06c7fa4e7f..f586b35154 100644 --- a/src/cpu/x86/smm/smmhandler.S +++ b/src/cpu/x86/smm/smmhandler.S @@ -77,7 +77,7 @@ #endif .global smm_handler_start smm_handler_start: -#if IS_ENABLED(CONFIG_SMM_LAPIC_REMAP_MITIGATION) +#if CONFIG(SMM_LAPIC_REMAP_MITIGATION) /* Check if the LAPIC register block overlaps with SMM. * This block needs to work without data accesses because they * may be routed into the LAPIC register block. @@ -139,7 +139,7 @@ untampered_lapic: /* This is an ugly hack, and we should find a way to read the CPU index * without relying on the LAPIC ID. */ -#if IS_ENABLED(CONFIG_CPU_AMD_AGESA_FAMILY15_TN) +#if CONFIG(CPU_AMD_AGESA_FAMILY15_TN) /* LAPIC IDs start from 0x10; map that to the proper core index */ subl $0x10, %ecx #endif diff --git a/src/cpu/x86/smm/smmrelocate.S b/src/cpu/x86/smm/smmrelocate.S index fa49def1ad..c282904de9 100644 --- a/src/cpu/x86/smm/smmrelocate.S +++ b/src/cpu/x86/smm/smmrelocate.S @@ -21,9 +21,9 @@ // can it be cleaned up so this include is not required? // It's needed right now because we get our DEFAULT_PMBASE from // here. -#if IS_ENABLED(CONFIG_SOUTHBRIDGE_INTEL_I82801DX) +#if CONFIG(SOUTHBRIDGE_INTEL_I82801DX) #include -#elif IS_ENABLED(CONFIG_SOUTHBRIDGE_INTEL_I82801IX) +#elif CONFIG(SOUTHBRIDGE_INTEL_I82801IX) #include #else #error "Southbridge needs SMM handler support." @@ -32,7 +32,7 @@ // ADDR32() macro #include -#if IS_ENABLED(CONFIG_SMM_TSEG) +#if CONFIG(SMM_TSEG) #error "Don't use this file with TSEG." #endif /* CONFIG_SMM_TSEG */ @@ -154,7 +154,7 @@ smm_relocate: /* End of southbridge specific section. */ -#if IS_ENABLED(CONFIG_DEBUG_SMM_RELOCATION) +#if CONFIG(DEBUG_SMM_RELOCATION) /* print [SMM-x] so we can determine if CPUx went to SMM */ movw $CONFIG_TTYS0_BASE, %dx mov $'[', %al -- cgit v1.2.3