diff options
| author | Nico Huber <nico.huber@secunet.com> | 2017-05-18 16:04:06 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2017-05-22 11:07:43 +0200 |
| commit | 7b811d5e3661874dfeca01901f3641eb70a95b1d (patch) | |
| tree | 7394373e62d53d5dd31c8162cbcf64ad460213d6 | |
| parent | 1b2d95feb30e30ccd6281117593ea1ae974fc480 (diff) | |
| download | coreboot-7b811d5e3661874dfeca01901f3641eb70a95b1d.tar.xz | |
device/oprom/include: Use IS_ENABLED() macro
Change-Id: Ibc3bf2f4f1e1bf1ffe9632aa150d549fcd6c201d
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/19762
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com>
| -rw-r--r-- | src/device/oprom/include/io.h | 2 | ||||
| -rw-r--r-- | src/device/oprom/include/x86emu/fpu_regs.h | 2 | ||||
| -rw-r--r-- | src/device/oprom/include/x86emu/regs.h | 2 | ||||
| -rw-r--r-- | src/device/oprom/include/x86emu/x86emu.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/device/oprom/include/io.h b/src/device/oprom/include/io.h index eb6bcee512..fc11640f72 100644 --- a/src/device/oprom/include/io.h +++ b/src/device/oprom/include/io.h @@ -11,7 +11,7 @@ * GNU General Public License for more details. */ -#if CONFIG_ARCH_X86 +#if IS_ENABLED(CONFIG_ARCH_X86) #include <arch/io.h> #else void outb(u8 val, u16 port); diff --git a/src/device/oprom/include/x86emu/fpu_regs.h b/src/device/oprom/include/x86emu/fpu_regs.h index 7c7df8562b..f49fb1dd39 100644 --- a/src/device/oprom/include/x86emu/fpu_regs.h +++ b/src/device/oprom/include/x86emu/fpu_regs.h @@ -102,7 +102,7 @@ struct x86_fpu_registers { #endif /* X86_FPU_SUPPORT */ -#if CONFIG_X86EMU_DEBUG +#if IS_ENABLED(CONFIG_X86EMU_DEBUG) # define DECODE_PRINTINSTR32(t,mod,rh,rl) \ DECODE_PRINTF(t[(mod<<3)+(rh)]); # define DECODE_PRINTINSTR256(t,mod,rh,rl) \ diff --git a/src/device/oprom/include/x86emu/regs.h b/src/device/oprom/include/x86emu/regs.h index 2fee548ce6..b5fb9e22b5 100644 --- a/src/device/oprom/include/x86emu/regs.h +++ b/src/device/oprom/include/x86emu/regs.h @@ -278,7 +278,7 @@ typedef struct { u32 mode; volatile int intr; /* mask of pending interrupts */ volatile int debug; -#if CONFIG_X86EMU_DEBUG +#if IS_ENABLED(CONFIG_X86EMU_DEBUG) int check; u16 saved_ip; u16 saved_cs; diff --git a/src/device/oprom/include/x86emu/x86emu.h b/src/device/oprom/include/x86emu/x86emu.h index bdc861facf..3d1b949dd5 100644 --- a/src/device/oprom/include/x86emu/x86emu.h +++ b/src/device/oprom/include/x86emu/x86emu.h @@ -43,7 +43,7 @@ #include <stddef.h> #include <console/console.h> -#if CONFIG_X86EMU_DEBUG +#if IS_ENABLED(CONFIG_X86EMU_DEBUG) #define DEBUG #endif @@ -153,7 +153,7 @@ void X86EMU_setMemBase(void *base, size_t size); void X86EMU_exec(void); void X86EMU_halt_sys(void); -#if CONFIG_X86EMU_DEBUG +#if IS_ENABLED(CONFIG_X86EMU_DEBUG) #define HALT_SYS() \ printf("halt_sys: in %s\n", __func__); \ X86EMU_halt_sys(); |