<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20337">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">device/oprom/yabel: add IS_ENABLED() around Kconfig symbol references<br><br>Some of these can be changed from #if to if(), but that will happen<br>in a follow-on commmit.<br><br>Change-Id: I82bf68a7ee54ff88f65aacc9eb0dbc30d013aae0<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/device/oprom/yabel/biosemu.c<br>M src/device/oprom/yabel/compat/functions.c<br>M src/device/oprom/yabel/device.c<br>M src/device/oprom/yabel/device.h<br>M src/device/oprom/yabel/interrupt.c<br>M src/device/oprom/yabel/io.c<br>M src/device/oprom/yabel/mem.c<br>M src/device/oprom/yabel/vbe.c<br>8 files changed, 50 insertions(+), 50 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/20337/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/device/oprom/yabel/biosemu.c b/src/device/oprom/yabel/biosemu.c<br>index a0a407f..a77157f 100644<br>--- a/src/device/oprom/yabel/biosemu.c<br>+++ b/src/device/oprom/yabel/biosemu.c<br>@@ -52,7 +52,7 @@<br> #include <device/device.h><br> #include "compat/rtas.h"<br> <br>-#if CONFIG_X86EMU_DEBUG_TIMINGS<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG_TIMINGS)<br> struct mono_time zero;<br> #endif<br> <br>@@ -87,44 +87,44 @@<br> {<br> u8 *rom_image;<br> int i = 0;<br>-#if CONFIG_X86EMU_DEBUG<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG)<br> debug_flags = 0;<br>-#if CONFIG_X86EMU_DEBUG_JMP<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG_JMP)<br> debug_flags |= DEBUG_JMP;<br> #endif<br>-#if CONFIG_X86EMU_DEBUG_TRACE<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG_TRACE)<br> debug_flags |= DEBUG_TRACE_X86EMU;<br> #endif<br>-#if CONFIG_X86EMU_DEBUG_PNP<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG_PNP)<br> debug_flags |= DEBUG_PNP;<br> #endif<br>-#if CONFIG_X86EMU_DEBUG_DISK<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG_DISK)<br> debug_flags |= DEBUG_DISK;<br> #endif<br>-#if CONFIG_X86EMU_DEBUG_PMM<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG_PMM)<br> debug_flags |= DEBUG_PMM;<br> #endif<br>-#if CONFIG_X86EMU_DEBUG_VBE<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG_VBE)<br> debug_flags |= DEBUG_VBE;<br> #endif<br>-#if CONFIG_X86EMU_DEBUG_INT10<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG_INT10)<br> debug_flags |= DEBUG_PRINT_INT10;<br> #endif<br>-#if CONFIG_X86EMU_DEBUG_INTERRUPTS<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG_INTERRUPTS)<br> debug_flags |= DEBUG_INTR;<br> #endif<br>-#if CONFIG_X86EMU_DEBUG_CHECK_VMEM_ACCESS<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG_CHECK_VMEM_ACCESS)<br> debug_flags |= DEBUG_CHECK_VMEM_ACCESS;<br> #endif<br>-#if CONFIG_X86EMU_DEBUG_MEM<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG_MEM)<br> debug_flags |= DEBUG_MEM;<br> #endif<br>-#if CONFIG_X86EMU_DEBUG_IO<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG_IO)<br> debug_flags |= DEBUG_IO;<br> #endif<br> <br> #endif<br>-#if CONFIG_X86EMU_DEBUG_TIMINGS<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG_TIMINGS)<br> /* required for i915tool compatible output */<br> zero.microseconds = 0;<br> #endif<br>@@ -345,7 +345,7 @@<br> * some boot device status in AX (see PNP BIOS Spec Section 3.3<br> */<br> DEBUG_PRINTF_CS_IP("Option ROM Exit Status: %04x\n", M.x86.R_AX);<br>-#if CONFIG_X86EMU_DEBUG<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG)<br> DEBUG_PRINTF("Exit Status Decode:\n");<br> if (M.x86.R_AX & 0x100) { // bit 8<br> DEBUG_PRINTF<br>diff --git a/src/device/oprom/yabel/compat/functions.c b/src/device/oprom/yabel/compat/functions.c<br>index 283c3eb..5a51f18 100644<br>--- a/src/device/oprom/yabel/compat/functions.c<br>+++ b/src/device/oprom/yabel/compat/functions.c<br>@@ -45,7 +45,7 @@<br> <br> #define VMEM_SIZE (1024 * 1024) /* 1 MB */<br> <br>-#if !CONFIG_YABEL_DIRECTHW<br>+#if !IS_ENABLED(CONFIG_YABEL_DIRECTHW)<br> #if CONFIG_YABEL_VIRTMEM_LOCATION<br> u8* vmem = (u8 *) CONFIG_YABEL_VIRTMEM_LOCATION;<br> #else<br>@@ -63,7 +63,7 @@<br> <br> biosemu(vmem, VMEM_SIZE, dev, addr);<br> <br>-#if CONFIG_FRAMEBUFFER_SET_VESA_MODE<br>+#if IS_ENABLED(CONFIG_FRAMEBUFFER_SET_VESA_MODE)<br> vbe_set_graphics();<br> #endif<br> }<br>@@ -73,7 +73,7 @@<br> u64 get_time(void)<br> {<br> u64 act = 0;<br>-#if CONFIG_ARCH_X86<br>+#if IS_ENABLED(CONFIG_ARCH_X86)<br> u32 eax, edx;<br> <br> __asm__ __volatile__(<br>diff --git a/src/device/oprom/yabel/device.c b/src/device/oprom/yabel/device.c<br>index ee920d5..b3e5d19 100644<br>--- a/src/device/oprom/yabel/device.c<br>+++ b/src/device/oprom/yabel/device.c<br>@@ -58,7 +58,7 @@<br> u64 size;<br> } __attribute__ ((__packed__)) assigned_address_t;<br> <br>-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL<br>+#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL)<br> /* coreboot version */<br> <br> static void<br>@@ -131,7 +131,7 @@<br> }<br> // store last entry index of translate_address_array<br> taa_last_entry = taa_index - 1;<br>-#if CONFIG_X86EMU_DEBUG<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG)<br> //dump translate_address_array<br> printf("translate_address_array:\n");<br> translate_address_t ta;<br>@@ -215,7 +215,7 @@<br> }<br> // store last entry index of translate_address_array<br> taa_last_entry = taa_index - 1;<br>-#if CONFIG_X86EMU_DEBUG<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG)<br> //dump translate_address_array<br> printf("translate_address_array:\n");<br> translate_address_t ta;<br>@@ -247,7 +247,7 @@<br> translate_address_array[taa_index].address_offset = 0;<br> }<br> <br>-#if !CONFIG_PCI_OPTION_ROM_RUN_YABEL<br>+#if !IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL)<br> // to simulate accesses to legacy VGA Memory (0xA0000-0xBFFFF)<br> // we look for the first prefetchable memory BAR, if no prefetchable BAR found,<br> // we use the first memory BAR<br>@@ -309,7 +309,7 @@<br> {<br> <br> u32 pci_config_0;<br>-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL<br>+#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL)<br> pci_config_0 = pci_read_config32(bios_device.dev, 0x0);<br> #else<br> pci_config_0 =<br>@@ -371,7 +371,7 @@<br> memcpy(&pci_ds, (void *) (rom_base_addr + pci_ds_offset),<br> sizeof(pci_ds));<br> clr_ci();<br>-#if CONFIG_X86EMU_DEBUG<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG)<br> DEBUG_PRINTF("PCI Data Structure @%lx:\n",<br> rom_base_addr + pci_ds_offset);<br> dump((void *) &pci_ds, sizeof(pci_ds));<br>@@ -435,7 +435,7 @@<br> DEBUG_PRINTF("%s\n", __func__);<br> memset(&bios_device, 0, sizeof(bios_device));<br> <br>-#if !CONFIG_PCI_OPTION_ROM_RUN_YABEL<br>+#if !IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL)<br> bios_device.ihandle = of_open(device_name);<br> if (bios_device.ihandle == 0) {<br> DEBUG_PRINTF("%s is no valid device!\n", device_name);<br>@@ -446,7 +446,7 @@<br> bios_device.dev = device;<br> #endif<br> biosemu_dev_get_addr_info();<br>-#if !CONFIG_PCI_OPTION_ROM_RUN_YABEL<br>+#if !IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL)<br> biosemu_dev_find_vmem_addr();<br> biosemu_dev_get_puid();<br> #endif<br>@@ -463,7 +463,7 @@<br> {<br> int i = 0;<br> translate_address_t ta;<br>-#if !CONFIG_PCI_OPTION_ROM_RUN_YABEL<br>+#if !IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL)<br> /* we don't need this hack for coreboot... we can access legacy areas */<br> //check if it is an access to legacy VGA Mem... if it is, map the address<br> //to the vmem BAR and then translate it...<br>diff --git a/src/device/oprom/yabel/device.h b/src/device/oprom/yabel/device.h<br>index 72a4d53..98b5c07 100644<br>--- a/src/device/oprom/yabel/device.h<br>+++ b/src/device/oprom/yabel/device.h<br>@@ -105,7 +105,7 @@<br> } biosemu_device_t;<br> <br> typedef struct {<br>-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL<br>+#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL)<br> unsigned long info;<br> #else<br> u8 info;<br>@@ -149,7 +149,7 @@<br> static inline void<br> out32le(void *addr, u32 val)<br> {<br>-#if CONFIG_ARCH_X86 || CONFIG_ARCH_ARM<br>+#if IS_ENABLED(CONFIG_ARCH_X86) || IS_ENABLED(CONFIG_ARCH_ARM)<br> *((u32*) addr) = cpu_to_le32(val);<br> #else<br> asm volatile ("stwbrx %0, 0, %1"::"r" (val), "r"(addr));<br>@@ -160,7 +160,7 @@<br> in32le(void *addr)<br> {<br> u32 val;<br>-#if CONFIG_ARCH_X86 || CONFIG_ARCH_ARM<br>+#if IS_ENABLED(CONFIG_ARCH_X86) || IS_ENABLED(CONFIG_ARCH_ARM)<br> val = cpu_to_le32(*((u32 *) addr));<br> #else<br> asm volatile ("lwbrx %0, 0, %1":"=r" (val):"r"(addr));<br>@@ -171,7 +171,7 @@<br> static inline void<br> out16le(void *addr, u16 val)<br> {<br>-#if CONFIG_ARCH_X86 || CONFIG_ARCH_ARM<br>+#if IS_ENABLED(CONFIG_ARCH_X86) || IS_ENABLED(CONFIG_ARCH_ARM)<br> *((u16*) addr) = cpu_to_le16(val);<br> #else<br> asm volatile ("sthbrx %0, 0, %1"::"r" (val), "r"(addr));<br>@@ -182,7 +182,7 @@<br> in16le(void *addr)<br> {<br> u16 val;<br>-#if CONFIG_ARCH_X86 || CONFIG_ARCH_ARM<br>+#if IS_ENABLED(CONFIG_ARCH_X86) || IS_ENABLED(CONFIG_ARCH_ARM)<br> val = cpu_to_le16(*((u16*) addr));<br> #else<br> asm volatile ("lhbrx %0, 0, %1":"=r" (val):"r"(addr));<br>diff --git a/src/device/oprom/yabel/interrupt.c b/src/device/oprom/yabel/interrupt.c<br>index e826fbf..67abe81 100644<br>--- a/src/device/oprom/yabel/interrupt.c<br>+++ b/src/device/oprom/yabel/interrupt.c<br>@@ -362,7 +362,7 @@<br> DEBUG_PRINTF_INTR("%s(): function: %x: PCI Find Device\n",<br> __func__, M.x86.R_AX);<br> /* FixME: support SI != 0 */<br>-#if CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES<br>+#if IS_ENABLED(CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES)<br> dev = dev_find_device(M.x86.R_DX, M.x86.R_CX, 0);<br> if (dev != 0) {<br> DEBUG_PRINTF_INTR<br>@@ -403,7 +403,7 @@<br> offs = M.x86.R_DI;<br> DEBUG_PRINTF_INTR("%s(): function: %x: PCI Config Read from device: bus: %02x, devfn: %02x, offset: %02x\n",<br> __func__, M.x86.R_AX, bus, devfn, offs);<br>-#if CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES<br>+#if IS_ENABLED(CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES)<br> dev = dev_find_slot(bus, devfn);<br> DEBUG_PRINTF_INTR("%s(): function: %x: dev_find_slot() returned: %s\n",<br> __func__, M.x86.R_AX, dev_path(dev));<br>@@ -427,7 +427,7 @@<br> switch (M.x86.R_AX) {<br> case 0xb108:<br> M.x86.R_CL =<br>-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL<br>+#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL)<br> pci_read_config8(dev, offs);<br> #else<br> (u8) rtas_pci_config_read(bios_device.<br>@@ -442,7 +442,7 @@<br> break;<br> case 0xb109:<br> M.x86.R_CX =<br>-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL<br>+#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL)<br> pci_read_config16(dev, offs);<br> #else<br> (u16) rtas_pci_config_read(bios_device.<br>@@ -457,7 +457,7 @@<br> break;<br> case 0xb10a:<br> M.x86.R_ECX =<br>-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL<br>+#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL)<br> pci_read_config32(dev, offs);<br> #else<br> (u32) rtas_pci_config_read(bios_device.<br>@@ -495,7 +495,7 @@<br> } else {<br> switch (M.x86.R_AX) {<br> case 0xb10b:<br>-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL<br>+#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL)<br> pci_write_config8(bios_device.dev, offs, M.x86.R_CL);<br> #else<br> rtas_pci_config_write(bios_device.puid, 1, bus,<br>@@ -507,7 +507,7 @@<br> M.x86.R_CL);<br> break;<br> case 0xb10c:<br>-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL<br>+#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL)<br> pci_write_config16(bios_device.dev, offs, M.x86.R_CX);<br> #else<br> rtas_pci_config_write(bios_device.puid, 2, bus,<br>@@ -519,7 +519,7 @@<br> M.x86.R_CX);<br> break;<br> case 0xb10d:<br>-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL<br>+#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL)<br> pci_write_config32(bios_device.dev, offs, M.x86.R_ECX);<br> #else<br> rtas_pci_config_write(bios_device.puid, 4, bus,<br>diff --git a/src/device/oprom/yabel/io.c b/src/device/oprom/yabel/io.c<br>index b824acc..d673801 100644<br>--- a/src/device/oprom/yabel/io.c<br>+++ b/src/device/oprom/yabel/io.c<br>@@ -47,7 +47,7 @@<br> <br> #include <arch/io.h><br> <br>-#if CONFIG_YABEL_DIRECTHW<br>+#if IS_ENABLED(CONFIG_YABEL_DIRECTHW)<br> u8 my_inb(X86EMU_pioAddr addr)<br> {<br> u8 val;<br>@@ -426,7 +426,7 @@<br> offs += (addr - 0xCFC); // if addr is not 0xcfc, the offset is moved accordingly<br> DEBUG_PRINTF_INTR("%s(): PCI Config Read from device: bus: %02x, devfn: %02x, offset: %02x\n",<br> __func__, bus, devfn, offs);<br>-#if CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES<br>+#if IS_ENABLED(CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES)<br> dev = dev_find_slot(bus, devfn);<br> DEBUG_PRINTF_INTR("%s(): dev_find_slot() returned: %s\n",<br> __func__, dev_path(dev));<br>@@ -446,7 +446,7 @@<br> HALT_SYS();<br> return 0;<br> } else {<br>-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL<br>+#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL)<br> switch (size) {<br> case 1:<br> rval = pci_read_config8(dev, offs);<br>@@ -495,11 +495,11 @@<br> printf<br> ("Config write access invalid! PCI device %x:%x.%x, offs: %x\n",<br> bus, devfn >> 3, devfn & 7, offs);<br>-#if !CONFIG_YABEL_PCI_FAKE_WRITING_OTHER_DEVICES_CONFIG<br>+#if !IS_ENABLED(CONFIG_YABEL_PCI_FAKE_WRITING_OTHER_DEVICES_CONFIG)<br> HALT_SYS();<br> #endif<br> } else {<br>-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL<br>+#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL)<br> switch (size) {<br> case 1:<br> pci_write_config8(bios_device.dev, offs, val);<br>diff --git a/src/device/oprom/yabel/mem.c b/src/device/oprom/yabel/mem.c<br>index d4221f8..86d9982 100644<br>--- a/src/device/oprom/yabel/mem.c<br>+++ b/src/device/oprom/yabel/mem.c<br>@@ -41,10 +41,10 @@<br> #include "compat/time.h"<br> #include <device/resource.h><br> <br>-#if !CONFIG_YABEL_DIRECTHW || !CONFIG_YABEL_DIRECTHW<br>+#if !IS_ENABLED(CONFIG_YABEL_DIRECTHW) || !IS_ENABLED(CONFIG_YABEL_DIRECTHW)<br> <br> // define a check for access to certain (virtual) memory regions (interrupt handlers, BIOS Data Area, ...)<br>-#if CONFIG_X86EMU_DEBUG<br>+#if IS_ENABLED(CONFIG_X86EMU_DEBUG)<br> static u8 in_check = 0; // to avoid recursion...<br> <br> static inline void DEBUG_CHECK_VMEM_READ(u32 _addr, u32 _rval)<br>diff --git a/src/device/oprom/yabel/vbe.c b/src/device/oprom/yabel/vbe.c<br>index ec99901..876df23 100644<br>--- a/src/device/oprom/yabel/vbe.c<br>+++ b/src/device/oprom/yabel/vbe.c<br>@@ -34,7 +34,7 @@<br> <br> #include <string.h><br> #include <types.h><br>-#if CONFIG_FRAMEBUFFER_SET_VESA_MODE<br>+#if IS_ENABLED(CONFIG_FRAMEBUFFER_SET_VESA_MODE)<br> #include <boot/coreboot_tables.h><br> #endif<br> <br>@@ -66,7 +66,7 @@<br> u8 *biosmem;<br> u32 biosmem_size;<br> <br>-#if CONFIG_FRAMEBUFFER_SET_VESA_MODE<br>+#if IS_ENABLED(CONFIG_FRAMEBUFFER_SET_VESA_MODE)<br> static inline u8<br> vbe_prepare(void)<br> {<br>@@ -734,7 +734,7 @@<br> vbe_get_mode_info(&mode_info);<br> vbe_set_mode(&mode_info);<br> <br>-#if CONFIG_BOOTSPLASH<br>+#if IS_ENABLED(CONFIG_BOOTSPLASH)<br> unsigned char *framebuffer =<br> (unsigned char *) le32_to_cpu(mode_info.vesa.phys_base_ptr);<br> DEBUG_PRINTF_VBE("FRAMEBUFFER: 0x%p\n", framebuffer);<br></pre><p>To view, visit <a href="https://review.coreboot.org/20337">change 20337</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/20337"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I82bf68a7ee54ff88f65aacc9eb0dbc30d013aae0 </div>
<div style="display:none"> Gerrit-Change-Number: 20337 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>