diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2009-07-18 18:42:13 -0500 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2009-07-18 19:43:04 -0500 |
| commit | 9993e196da707a0a1cd4584f1fcef12382c1c144 (patch) | |
| tree | 0773fb15441d2175f439111d87219d7b20e620ac /board/freescale/mpc837xerdb | |
| parent | d39041fcadb1231430201d298c31f6be03d654f7 (diff) | |
| download | blackbird-obmc-uboot-9993e196da707a0a1cd4584f1fcef12382c1c144.tar.gz blackbird-obmc-uboot-9993e196da707a0a1cd4584f1fcef12382c1c144.zip | |
mpc83xx: convert all remaining boards over to 83XX_GENERIC_PCI
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Diffstat (limited to 'board/freescale/mpc837xerdb')
| -rw-r--r-- | board/freescale/mpc837xerdb/Makefile | 4 | ||||
| -rw-r--r-- | board/freescale/mpc837xerdb/pci.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/board/freescale/mpc837xerdb/Makefile b/board/freescale/mpc837xerdb/Makefile index a97116c391..c34905c74a 100644 --- a/board/freescale/mpc837xerdb/Makefile +++ b/board/freescale/mpc837xerdb/Makefile @@ -25,8 +25,10 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := $(BOARD).o pci.o +COBJS-y += $(BOARD).o +COBJS-$(CONFIG_PCI) += pci.o +COBJS := $(COBJS-y) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) diff --git a/board/freescale/mpc837xerdb/pci.c b/board/freescale/mpc837xerdb/pci.c index 83e89cf2ec..97ad227bc6 100644 --- a/board/freescale/mpc837xerdb/pci.c +++ b/board/freescale/mpc837xerdb/pci.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 Freescale Semiconductor, Inc. + * Copyright (C) 2006-2009 Freescale Semiconductor, Inc. * * See file CREDITS for list of people who contributed to this * project. @@ -15,7 +15,6 @@ #include <pci.h> #include <asm/io.h> -#if defined(CONFIG_PCI) static struct pci_region pci_regions[] = { { bus_start: CONFIG_SYS_PCI_MEM_BASE, @@ -113,4 +112,3 @@ void pci_init_board(void) mpc83xx_pcie_init(2, pcie_reg, 0); } -#endif /* CONFIG_PCI */ |
