From 21f8193843234ab0f2c256719ab3681201f3d3dd Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 21 Oct 2015 13:04:34 -0700 Subject: [PATCH] yabel: Use IS_ENABLED where appropriate Change-Id: Ib078b21ddf0493ad6795c6ab79125b3917ff7049 Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/12115 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Patrick Georgi --- src/device/oprom/yabel/debug.h | 6 +++--- src/device/oprom/yabel/device.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/device/oprom/yabel/debug.h b/src/device/oprom/yabel/debug.h index 2e714a3fda..eb882d02e4 100644 --- a/src/device/oprom/yabel/debug.h +++ b/src/device/oprom/yabel/debug.h @@ -16,7 +16,7 @@ #include #include -#if CONFIG_X86EMU_DEBUG_TIMINGS +#if IS_ENABLED(CONFIG_X86EMU_DEBUG_TIMINGS) extern struct mono_time zero; #endif extern u32 debug_flags; @@ -70,7 +70,7 @@ static inline void set_ci(void) {}; // set to enable tracing of JMPs in x86emu #define DEBUG_JMP 0x2000 -#if CONFIG_X86EMU_DEBUG +#if IS_ENABLED(CONFIG_X86EMU_DEBUG) #define CHECK_DBG(_flag) if (debug_flags & _flag) @@ -78,7 +78,7 @@ static inline void set_ci(void) {}; // prints the CS:IP before the printout, NOTE: actually its CS:IP of the _next_ instruction // to be executed, since the x86emu advances CS:IP _before_ actually executing an instruction -#if CONFIG_X86EMU_DEBUG_TIMINGS +#if IS_ENABLED(CONFIG_X86EMU_DEBUG_TIMINGS) #define DEBUG_PRINTF_CS_IP(_x...) DEBUG_PRINTF("[%08lx]%x:%x ", (current_time_from(&zero)).microseconds, M.x86.R_CS, M.x86.R_IP); DEBUG_PRINTF(_x); #else #define DEBUG_PRINTF_CS_IP(_x...) DEBUG_PRINTF("%x:%x ", M.x86.R_CS, M.x86.R_IP); DEBUG_PRINTF(_x); diff --git a/src/device/oprom/yabel/device.h b/src/device/oprom/yabel/device.h index 5259125f74..a8dfc8c4a1 100644 --- a/src/device/oprom/yabel/device.h +++ b/src/device/oprom/yabel/device.h @@ -62,7 +62,7 @@ typedef struct { typedef struct { u8 bus; u8 devfn; -#if CONFIG_PCI_OPTION_ROM_RUN_YABEL +#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL) struct device* dev; #else u64 puid;