diff options
| author | Martin Roth <martinroth@google.com> | 2017-06-24 14:00:01 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-06-28 17:48:57 +0000 |
| commit | b3b114c28f6e7c11b327fce84d93141498d5f665 (patch) | |
| tree | 4ca1b11a12b72dded9f8bf96ec39691621239400 /src/device/oprom | |
| parent | ebade5dec9e05291f64b0687130d6fbce52270f0 (diff) | |
src/device: add IS_ENABLED() around Kconfig symbol references
Some of these can be changed from #if to if(), but that will happen
in a follow-on commmit.
Change-Id: I66cde1adcf373889b03f144793c0b4f46d21ca31
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/20338
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/device/oprom')
| -rw-r--r-- | src/device/oprom/realmode/x86.c | 10 | ||||
| -rw-r--r-- | src/device/oprom/realmode/x86_interrupts.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c index 69ac1fe23d..d9fac36b66 100644 --- a/src/device/oprom/realmode/x86.c +++ b/src/device/oprom/realmode/x86.c @@ -212,7 +212,7 @@ static void setup_realmode_idt(void) write_idt_stub((void *)0xffe6e, 0x1a); } -#if CONFIG_FRAMEBUFFER_SET_VESA_MODE +#if IS_ENABLED(CONFIG_FRAMEBUFFER_SET_VESA_MODE) vbe_mode_info_t mode_info; static int mode_info_valid; @@ -268,7 +268,7 @@ void vbe_set_graphics(void) } vbe_set_mode(&mode_info); -#if CONFIG_BOOTSPLASH +#if IS_ENABLED(CONFIG_BOOTSPLASH) struct jpeg_decdata *decdata; unsigned char *jpeg = cbfs_boot_map_with_leak("bootsplash.jpg", CBFS_TYPE_BOOTSPLASH, @@ -349,13 +349,13 @@ void run_bios(struct device *dev, unsigned long addr) realmode_call(addr + 0x0003, num_dev, 0xffff, 0x0000, 0xffff, 0x0, 0x0); printk(BIOS_DEBUG, "... Option ROM returned.\n"); -#if CONFIG_FRAMEBUFFER_SET_VESA_MODE +#if IS_ENABLED(CONFIG_FRAMEBUFFER_SET_VESA_MODE) if ((dev->class >> 8)== PCI_CLASS_DISPLAY_VGA) vbe_set_graphics(); #endif } -#if CONFIG_GEODE_VSA +#if IS_ENABLED(CONFIG_GEODE_VSA) #define VSA2_BUFFER 0x60000 #define VSA2_ENTRY_POINT 0x60020 @@ -459,7 +459,7 @@ int asmlinkage interrupt_handler(u32 intnumber, cs = cs_ip >> 16; flags = stackflags; -#if CONFIG_REALMODE_DEBUG +#if IS_ENABLED(CONFIG_REALMODE_DEBUG) printk(BIOS_DEBUG, "oprom: INT# 0x%x\n", intnumber); printk(BIOS_DEBUG, "oprom: eax: %08x ebx: %08x ecx: %08x edx: %08x\n", eax, ebx, ecx, edx); diff --git a/src/device/oprom/realmode/x86_interrupts.c b/src/device/oprom/realmode/x86_interrupts.c index 05cdd4a0c2..7ec77f8b9d 100644 --- a/src/device/oprom/realmode/x86_interrupts.c +++ b/src/device/oprom/realmode/x86_interrupts.c @@ -212,7 +212,7 @@ int int1a_handler(void) break; } -#if CONFIG_REALMODE_DEBUG +#if IS_ENABLED(CONFIG_REALMODE_DEBUG) printk(BIOS_DEBUG, "0x%x: bus %d devfn 0x%x reg 0x%x val 0x%x\n", func, bus, devfn, reg, X86_ECX); #endif |