diff options
| author | Graeme Russ <graeme.russ@gmail.com> | 2009-08-23 12:59:57 +1000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-09-04 21:57:22 +0200 |
| commit | f50b619d9cb297b0125fe78dcd6f255eb0d91659 (patch) | |
| tree | 01683f12f8c3b47b55784f25bad85c1dabc1ec21 /lib_i386 | |
| parent | ed7a1b681de1e31d18d5b92e2767ae8df3241687 (diff) | |
i386: Moved PCI from #ifdef to conditional compile for sc520 boards
Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
Diffstat (limited to 'lib_i386')
| -rw-r--r-- | lib_i386/Makefile | 4 | ||||
| -rw-r--r-- | lib_i386/pci.c | 3 | ||||
| -rw-r--r-- | lib_i386/pci_type1.c | 5 |
3 files changed, 2 insertions, 10 deletions
diff --git a/lib_i386/Makefile b/lib_i386/Makefile index ec6f2360522..bb9b330ac64 100644 --- a/lib_i386/Makefile +++ b/lib_i386/Makefile @@ -32,8 +32,8 @@ SOBJS-y += realmode_switch.o COBJS-y += bios_setup.o COBJS-y += board.o COBJS-y += bootm.o -COBJS-y += pci.o -COBJS-y += pci_type1.o +COBJS-$(CONFIG_PCI) += pci.o +COBJS-$(CONFIG_PCI) += pci_type1.o COBJS-y += realmode.o COBJS-y += video_bios.o COBJS-y += video.o diff --git a/lib_i386/pci.c b/lib_i386/pci.c index f366bdc6724..9020e7ce764 100644 --- a/lib_i386/pci.c +++ b/lib_i386/pci.c @@ -26,7 +26,6 @@ #include <asm/io.h> #include <asm/pci.h> -#ifdef CONFIG_PCI #undef PCI_ROM_SCAN_VERBOSE int pci_shadow_rom(pci_dev_t dev, unsigned char *dest) @@ -151,5 +150,3 @@ int pci_shadow_rom(pci_dev_t dev, unsigned char *dest) return res; } - -#endif diff --git a/lib_i386/pci_type1.c b/lib_i386/pci_type1.c index 8da8c1ced75..225ae4a9909 100644 --- a/lib_i386/pci_type1.c +++ b/lib_i386/pci_type1.c @@ -11,9 +11,6 @@ */ #include <common.h> - -#ifdef CONFIG_PCI - #include <asm/io.h> #include <pci.h> @@ -52,5 +49,3 @@ void pci_setup_type1(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data) hose->cfg_addr = (unsigned int *) cfg_addr; hose->cfg_data = (unsigned char *) cfg_data; } - -#endif |