Patch set updated for coreboot: dc73298 Remove guarding #includes by CONFIG_FOO combinations
Edward O'Callaghan (eocallaghan@alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6055
-gerrit
commit dc73298424c03868a36dfd483e685787f4651f9d Author: Edward O'Callaghan eocallaghan@alterapraxis.com Date: Tue Jun 17 17:05:36 2014 +1000
Remove guarding #includes by CONFIG_FOO combinations
First of many to remove guarding the inclusion of headers based on CONFIG_ options. This *potentially* could hide issues such as functions being swapped from under our feet, since different runtime behaviour could be declared with the function same name and type-signature. Hence, depending on the header we happen to get may change runtime behaviour.
Change-Id: Ife56801c783c44e1882abef711e09b85b7f295a4 Signed-off-by: Edward O'Callaghan eocallaghan@alterapraxis.com --- src/device/oprom/yabel/interrupt.c | 2 -- src/device/oprom/yabel/io.c | 9 +-------- src/device/oprom/yabel/mem.c | 5 +---- src/mainboard/google/stout/i915.c | 2 -- src/mainboard/intel/cougar_canyon2/mainboard.c | 2 -- src/mainboard/lenovo/x201/mainboard.c | 2 -- src/northbridge/intel/i82830/vga.c | 2 -- 7 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/src/device/oprom/yabel/interrupt.c b/src/device/oprom/yabel/interrupt.c index cf430be..92b058b 100644 --- a/src/device/oprom/yabel/interrupt.c +++ b/src/device/oprom/yabel/interrupt.c @@ -24,10 +24,8 @@ #include <x86emu/x86emu.h> #include "../x86emu/prim_ops.h"
-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL #include <device/pci.h> #include <device/pci_ops.h> -#endif
//setup to run the code at the address, that the Interrupt Vector points to... diff --git a/src/device/oprom/yabel/io.c b/src/device/oprom/yabel/io.c index 94f610d..37beccb 100644 --- a/src/device/oprom/yabel/io.c +++ b/src/device/oprom/yabel/io.c @@ -20,15 +20,12 @@ #include <device/oprom/include/io.h> #include "io.h"
-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL #include <device/pci.h> #include <device/pci_ops.h> #include <device/resource.h> -#endif
-#if CONFIG_ARCH_X86 #include <arch/io.h> -#else + // these are not used, only needed for linking, must be overridden using X86emu_setupPioFuncs // with the functions and struct below void @@ -76,10 +73,6 @@ inl(u16 port) return 0; }
-#ifndef CONFIG_PCI -#endif -#endif - #if CONFIG_YABEL_DIRECTHW u8 my_inb(X86EMU_pioAddr addr) { diff --git a/src/device/oprom/yabel/mem.c b/src/device/oprom/yabel/mem.c index a7d0289..620548d 100644 --- a/src/device/oprom/yabel/mem.c +++ b/src/device/oprom/yabel/mem.c @@ -18,13 +18,10 @@ #include "biosemu.h" #include "mem.h" #include "compat/time.h" +#include <device/resource.h>
#if !CONFIG_YABEL_DIRECTHW || !CONFIG_YABEL_DIRECTHW
-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL -#include <device/resource.h> -#endif - // define a check for access to certain (virtual) memory regions (interrupt handlers, BIOS Data Area, ...) #if CONFIG_X86EMU_DEBUG static u8 in_check = 0; // to avoid recursion... diff --git a/src/mainboard/google/stout/i915.c b/src/mainboard/google/stout/i915.c index 4ebd567..3c1e672 100644 --- a/src/mainboard/google/stout/i915.c +++ b/src/mainboard/google/stout/i915.c @@ -6,9 +6,7 @@ #include <device/pci_ops.h> #include <console/console.h> #include <delay.h> -#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL)&&CONFIG_PCI_OPTION_ROM_RUN_YABEL #include <x86emu/x86emu.h> -#endif #include <pc80/mc146818rtc.h> #include <arch/acpi.h> #include <arch/io.h> diff --git a/src/mainboard/intel/cougar_canyon2/mainboard.c b/src/mainboard/intel/cougar_canyon2/mainboard.c index e7dda02..c51abed 100644 --- a/src/mainboard/intel/cougar_canyon2/mainboard.c +++ b/src/mainboard/intel/cougar_canyon2/mainboard.c @@ -25,9 +25,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> -#endif #include <pc80/mc146818rtc.h> #include <arch/acpi.h> #include <arch/io.h> diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c index 786d560..db36a88 100644 --- a/src/mainboard/lenovo/x201/mainboard.c +++ b/src/mainboard/lenovo/x201/mainboard.c @@ -40,10 +40,8 @@ #include "dock.h" #include "hda_verb.h" #include <arch/x86/include/arch/acpigen.h> -#if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE #include <x86emu/regs.h> #include <arch/interrupt.h> -#endif #include <pc80/keyboard.h> #include <cpu/x86/lapic.h> #include <device/pci.h> diff --git a/src/northbridge/intel/i82830/vga.c b/src/northbridge/intel/i82830/vga.c index 40f23cc..f846e37 100644 --- a/src/northbridge/intel/i82830/vga.c +++ b/src/northbridge/intel/i82830/vga.c @@ -25,9 +25,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <cbfs.h> -#if CONFIG_PCI_OPTION_ROM_RUN_YABEL #include <x86emu/x86emu.h> -#endif
static void vga_init(device_t dev) {
-
Edward O'Callaghan