some ifdef --> if fixes

[coreboot.git] / src / devices / oprom / yabel / device.c

diff --git a/src/devices/oprom/yabel/device.c b/src/devices/oprom/yabel/device.c
index dd078c72c6ab0d3f8c1c54f463292fd454589cb5..82595945a8909ae3523e1c7713aff0710cbb2b87 100644 (file)
--- a/src/devices/oprom/yabel/device.c
+++ b/src/devices/oprom/yabel/device.c
@@ -37,7 +37,7 @@ typedef struct {
        u64 size;
 } __attribute__ ((__packed__)) assigned_address_t;
 
-#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
 /* coreboot version */
 
 static void
@@ -110,7 +110,7 @@ biosemu_dev_get_addr_info(void)
        }
        // store last entry index of translate_address_array
        taa_last_entry = taa_index - 1;
-#if defined(CONFIG_X86EMU_DEBUG) && CONFIG_X86EMU_DEBUG
+#if CONFIG_X86EMU_DEBUG
        //dump translate_address_array
        printf("translate_address_array: \n");
        translate_address_t ta;
@@ -194,7 +194,7 @@ biosemu_dev_get_addr_info(void)
        }
        // store last entry index of translate_address_array
        taa_last_entry = taa_index - 1;
-#if defined(CONFIG_X86EMU_DEBUG) && CONFIG_X86EMU_DEBUG
+#if CONFIG_X86EMU_DEBUG
        //dump translate_address_array
        printf("translate_address_array: \n");
        translate_address_t ta;
@@ -226,7 +226,7 @@ biosemu_add_special_memory(u32 start, u32 size)
        translate_address_array[taa_index].address_offset = 0;
 }
 
-#ifndef CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if !CONFIG_PCI_OPTION_ROM_RUN_YABEL
 // to simulate accesses to legacy VGA Memory (0xA0000-0xBFFFF)
 // we look for the first prefetchable memory BAR, if no prefetchable BAR found,
 // we use the first memory BAR
@@ -288,7 +288,7 @@ biosemu_dev_get_device_vendor_id(void)
 {
 
        u32 pci_config_0;
-#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
        pci_config_0 = pci_read_config32(bios_device.dev, 0x0);
 #else
        pci_config_0 =
@@ -350,7 +350,7 @@ biosemu_dev_check_exprom(unsigned long rom_base_addr)
                memcpy(&pci_ds, (void *) (rom_base_addr + pci_ds_offset),
                       sizeof(pci_ds));
                clr_ci();
-#if defined(CONFIG_X86EMU_DEBUG) && CONFIG_X86EMU_DEBUG
+#if CONFIG_X86EMU_DEBUG
                DEBUG_PRINTF("PCI Data Structure @%lx:\n",
                             rom_base_addr + pci_ds_offset);
                dump((void *) &pci_ds, sizeof(pci_ds));
@@ -412,7 +412,7 @@ biosemu_dev_init(struct device * device)
        DEBUG_PRINTF("%s\n", __func__);
        memset(&bios_device, 0, sizeof(bios_device));
 
-#ifndef CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if !CONFIG_PCI_OPTION_ROM_RUN_YABEL
        bios_device.ihandle = of_open(device_name);
        if (bios_device.ihandle == 0) {
                DEBUG_PRINTF("%s is no valid device!\n", device_name);
@@ -423,7 +423,7 @@ biosemu_dev_init(struct device * device)
        bios_device.dev = device;
 #endif
        biosemu_dev_get_addr_info();
-#ifndef CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if !CONFIG_PCI_OPTION_ROM_RUN_YABEL
        biosemu_dev_find_vmem_addr();
        biosemu_dev_get_puid();
 #endif
@@ -440,7 +440,7 @@ biosemu_dev_translate_address(int type, unsigned long * addr)
 {
        int i = 0;
        translate_address_t ta;
-#ifndef CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if !CONFIG_PCI_OPTION_ROM_RUN_YABEL
        /* we dont need this hack for coreboot... we can access legacy areas */
        //check if it is an access to legacy VGA Mem... if it is, map the address
        //to the vmem BAR and then translate it...