This patch unifies the use of config options in v2 to all start with CONFIG_

[coreboot.git] / src / include / x86emu / x86emu.h

diff --git a/src/include/x86emu/x86emu.h b/src/include/x86emu/x86emu.h
index bd45fea423924a39bc06161d3c3feab0ccdab061..bd01f20cc415ed957457483d87a4484b01e3a597 100644 (file)
--- a/src/include/x86emu/x86emu.h
+++ b/src/include/x86emu/x86emu.h
@@ -42,6 +42,10 @@
 #ifndef __X86EMU_X86EMU_H
 #define __X86EMU_X86EMU_H
 
+#if defined(CONFIG_DEBUG) && (CONFIG_DEBUG == 0)
+#undef CONFIG_DEBUG
+#endif
+
 /* FIXME: undefine printk for the moment */
 #ifdef COREBOOT_VERSION
 #include "console/console.h"
@@ -161,7 +165,7 @@ void        X86EMU_prepareForInt(int num);
 void   X86EMU_exec(void);
 void   X86EMU_halt_sys(void);
 
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
 #define        HALT_SYS()      \
        printk("halt_sys: file %s, line %d\n", __FILE__, __LINE__);     \
        X86EMU_halt_sys();
@@ -187,6 +191,8 @@ void        X86EMU_halt_sys(void);
 #define DEBUG_TRACECALL_REGS_F  0x004000
 #define DEBUG_DECODE_NOPRINT_F  0x008000 
 #define DEBUG_SAVE_IP_CS_F      0x010000
+#define DEBUG_TRACEJMP_F        0x020000
+#define DEBUG_TRACEJMP_REGS_F   0x040000
 #define DEBUG_SYS_F             (DEBUG_SVC_F|DEBUG_FS_F|DEBUG_PROC_F)
 
 void   X86EMU_trace_regs(void);