GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

yabel: Use IS_ENABLED where appropriate 

Change-Id: Ib078b21ddf0493ad6795c6ab79125b3917ff7049
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/12115
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Stefan Reinauer 2015-10-21 13:04:34 -07:00 committed by Patrick Georgi
parent 4919047d31
commit 21f8193843
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/device/oprom/yabel/debug.h
View File

@ -16,7 +16,7 @@
#include <timer.h> #include <timer.h>
#include <types.h> #include <types.h>
#if CONFIG_X86EMU_DEBUG_TIMINGS #if IS_ENABLED(CONFIG_X86EMU_DEBUG_TIMINGS)
extern struct mono_time zero; extern struct mono_time zero;
#endif #endif
extern u32 debug_flags; extern u32 debug_flags;
@ -70,7 +70,7 @@ static inline void set_ci(void) {};
// set to enable tracing of JMPs in x86emu // set to enable tracing of JMPs in x86emu
#define DEBUG_JMP 0x2000 #define DEBUG_JMP 0x2000
#if CONFIG_X86EMU_DEBUG #if IS_ENABLED(CONFIG_X86EMU_DEBUG)
#define CHECK_DBG(_flag) if (debug_flags & _flag) #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 // 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 // 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); #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 #else
#define DEBUG_PRINTF_CS_IP(_x...) DEBUG_PRINTF("%x:%x ", M.x86.R_CS, M.x86.R_IP); DEBUG_PRINTF(_x); #define DEBUG_PRINTF_CS_IP(_x...) DEBUG_PRINTF("%x:%x ", M.x86.R_CS, M.x86.R_IP); DEBUG_PRINTF(_x);

2
src/device/oprom/yabel/device.h
View File

@ -62,7 +62,7 @@ typedef struct {
typedef struct { typedef struct {
u8 bus; u8 bus;
u8 devfn; u8 devfn;
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL #if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL)
struct device* dev; struct device* dev;
#else #else
u64 puid; u64 puid;