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/mp_init.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/cpu/x86/mp_init.c') diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c index 3889c7d28e..2057df011f 100644 --- a/src/cpu/x86/mp_init.c +++ b/src/cpu/x86/mp_init.c @@ -714,7 +714,7 @@ struct mp_state { static int is_smm_enabled(void) { - return IS_ENABLED(CONFIG_HAVE_SMI_HANDLER) && mp_state.do_smm; + return CONFIG(HAVE_SMI_HANDLER) && mp_state.do_smm; } static void smm_disable(void) @@ -724,7 +724,7 @@ static void smm_disable(void) static void smm_enable(void) { - if (IS_ENABLED(CONFIG_HAVE_SMI_HANDLER)) + if (CONFIG(HAVE_SMI_HANDLER)) mp_state.do_smm = 1; } @@ -891,7 +891,7 @@ static int run_ap_work(struct mp_callback *val, long expire_us) struct stopwatch sw; int cur_cpu = cpu_index(); - if (!IS_ENABLED(CONFIG_PARALLEL_MP_AP_WORK)) { + if (!CONFIG(PARALLEL_MP_AP_WORK)) { printk(BIOS_ERR, "APs already parked. PARALLEL_MP_AP_WORK not selected.\n"); return -1; } @@ -933,7 +933,7 @@ static void ap_wait_for_instruction(void) struct mp_callback **per_cpu_slot; int cur_cpu; - if (!IS_ENABLED(CONFIG_PARALLEL_MP_AP_WORK)) + if (!CONFIG(PARALLEL_MP_AP_WORK)) return; cur_cpu = cpu_index(); @@ -1028,7 +1028,7 @@ static void fill_mp_state(struct mp_state *state, const struct mp_ops *ops) * Default to smm_initiate_relocation() if trigger callback isn't * provided. */ - if (IS_ENABLED(CONFIG_HAVE_SMI_HANDLER) && + if (CONFIG(HAVE_SMI_HANDLER) && ops->per_cpu_smm_trigger == NULL) mp_state.ops.per_cpu_smm_trigger = smm_initiate_relocation; } -- cgit v1.2.3