4 files changed, 8 insertions, 8 deletions
diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h
index 6f3cbdb2c1..e781b5a5bb 100644
--- a/src/include/cpu/x86/lapic.h
+++ b/src/include/cpu/x86/lapic.h
@@ -7,7 +7,7 @@
 #include <smp/node.h>
 
 /* See if I need to initialize the local APIC */
-#if CONFIG_SMP || CONFIG_IOAPIC
+#if IS_ENABLED(CONFIG_SMP) || IS_ENABLED(CONFIG_IOAPIC)
 #  define NEED_LAPIC 1
 #else
 #  define NEED_LAPIC 0
@@ -54,7 +54,7 @@ static inline __attribute__((always_inline)) unsigned long lapicid(void)
 	return lapic_read(LAPIC_ID) >> 24;
 }
 
-#if !CONFIG_AP_IN_SIPI_WAIT
+#if !IS_ENABLED(CONFIG_AP_IN_SIPI_WAIT)
 /* If we need to go back to sipi wait, we use the long non-inlined version of
  * this function in lapic_cpu_init.c
  */
@@ -149,7 +149,7 @@ static inline int lapic_remote_read(int apicid, int reg, unsigned long *pvalue)
 
 void setup_lapic(void);
 
-#if CONFIG_SMP
+#if IS_ENABLED(CONFIG_SMP)
 struct device;
 int start_cpu(struct device *cpu);
 #endif /* CONFIG_SMP */
diff --git a/src/include/cpu/x86/post_code.h b/src/include/cpu/x86/post_code.h
index 6acfe106e3..cd3d1599ed 100644
--- a/src/include/cpu/x86/post_code.h
+++ b/src/include/cpu/x86/post_code.h
@@ -2,7 +2,7 @@
 #include <console/post_codes.h>
 
 
-#if CONFIG_POST_IO
+#if IS_ENABLED(CONFIG_POST_IO)
 #define post_code(value)        \
 	movb    $value, %al;    \
 	outb    %al, $CONFIG_POST_IO_PORT
diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h
index 34e3d05f2c..bd0e356a3c 100644
--- a/src/include/cpu/x86/smm.h
+++ b/src/include/cpu/x86/smm.h
@@ -479,7 +479,7 @@ int mainboard_io_trap_handler(int smif);
 
 void southbridge_smi_set_eos(void);
 
-#if CONFIG_SMM_TSEG
+#if IS_ENABLED(CONFIG_SMM_TSEG)
 void cpu_smi_handler(void);
 void northbridge_smi_handler(void);
 void southbridge_smi_handler(void);
@@ -494,7 +494,7 @@ void mainboard_smi_gpi(u32 gpi_sts);
 int  mainboard_smi_apmc(u8 data);
 void mainboard_smi_sleep(u8 slp_typ);
 
-#if !CONFIG_SMM_TSEG
+#if !IS_ENABLED(CONFIG_SMM_TSEG)
 void smi_release_lock(void);
 #endif
 
diff --git a/src/include/cpu/x86/tsc.h b/src/include/cpu/x86/tsc.h
index 5a7fbc2007..4cf4fbc5b0 100644
--- a/src/include/cpu/x86/tsc.h
+++ b/src/include/cpu/x86/tsc.h
@@ -3,9 +3,9 @@
 
 #include <stdint.h>
 
-#if CONFIG_TSC_SYNC_MFENCE
+#if IS_ENABLED(CONFIG_TSC_SYNC_MFENCE)
 #define TSC_SYNC "mfence\n"
-#elif CONFIG_TSC_SYNC_LFENCE
+#elif IS_ENABLED(CONFIG_TSC_SYNC_LFENCE)
 #define TSC_SYNC "lfence\n"
 #else
 #define TSC_SYNC