erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UPSTREAM: device/oprom/include: Use IS_ENABLED() macro

Browse source 
BUG=none
BRANCH=none
TEST=none

Change-Id: I8f2ed39289ba05921c2f01f410eef40ee46643c0
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: 7b811d5e36
Original-Change-Id: Ibc3bf2f4f1e1bf1ffe9632aa150d549fcd6c201d
Original-Signed-off-by: Nico Huber <nico.huber@secunet.com>
Original-Reviewed-on: https://review.coreboot.org/19762
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Philippe Mathieu-Daud <philippe.mathieu.daude@gmail.com>
Reviewed-on: https://chromium-review.googlesource.com/510775
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
This commit is contained in:
Nico Huber 2017-05-18 16:04:06 +02:00 • committed by chrome-bot
commit ac9cf14d54
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/device/oprom/include/io.h
View file

@ -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);

2
src/device/oprom/include/x86emu/fpu_regs.h
View file

@ -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) \

2
src/device/oprom/include/x86emu/regs.h
View file

@ -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;

4
src/device/oprom/include/x86emu/x86emu.h
View file

@ -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();