summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-01-31 08:56:49 +0100
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-01-31 10:16:01 +0100
commit8cb79b5f275f1888ccb278a2d2197140444a84b7 (patch)
tree7f803adbe55d672cfa33a991f4ec9f26d964f0f2
parent012d5bab09a534e4800b02f50cf508e6837202ea (diff)
ixp: move pci drivers to drivers/pci
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r--cpu/ixp/Makefile1
-rw-r--r--drivers/pci/Makefile1
-rw-r--r--drivers/pci/pci_ixp.c (renamed from cpu/ixp/pci.c)0
-rw-r--r--include/configs/ixdp425.h1
4 files changed, 2 insertions, 1 deletions
diff --git a/cpu/ixp/Makefile b/cpu/ixp/Makefile
index afa972a919..6deecd4da1 100644
--- a/cpu/ixp/Makefile
+++ b/cpu/ixp/Makefile
@@ -28,7 +28,6 @@ LIB = $(obj)lib$(CPU).a
START = start.o
COBJS-y += cpu.o
COBJS-y += interrupts.o
-COBJS-$(CONFIG_PCI) += pci.o
COBJS-y += serial.o
ifndef CONFIG_USE_IRQ
COBJS-y += timer.o
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index bffb1eb1a1..0c4fa802a3 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -27,6 +27,7 @@ LIB := $(obj)libpci.a
COBJS-$(CONFIG_FSL_PCI_INIT) += fsl_pci_init.o
COBJS-$(CONFIG_PCI) += pci.o pci_auto.o pci_indirect.o
+COBJS-$(CONFIG_IXP_PCI) += pci_ixp.o
COBJS-$(CONFIG_SH4_PCI) += pci_sh4.o
COBJS-$(CONFIG_SH7751_PCI) +=pci_sh7751.o
COBJS-$(CONFIG_SH7780_PCI) +=pci_sh7780.o
diff --git a/cpu/ixp/pci.c b/drivers/pci/pci_ixp.c
index aae3d3d2c1..aae3d3d2c1 100644
--- a/cpu/ixp/pci.c
+++ b/drivers/pci/pci_ixp.c
diff --git a/include/configs/ixdp425.h b/include/configs/ixdp425.h
index 35b045127c..edebb40e1d 100644
--- a/include/configs/ixdp425.h
+++ b/include/configs/ixdp425.h
@@ -73,6 +73,7 @@
#define CONFIG_PCI
+#define CONFIG_IXP_PCI
#define CONFIG_NET_MULTI
#define CONFIG_EEPRO100