ixp: move pci drivers to drivers/pci

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/cpu/ixp/Makefile b/cpu/ixp/Makefile
index afa972a919fc2407002adc6c4f79eced78ec0f58..6deecd4da1eb111d245d8965a9bf1235165c0a3e 100644 (file)
--- 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 bffb1eb1a138229c82d8df5ed467a92dbd3439ea..0c4fa802a3bfb60acad2330205d037b2b599cb58 100644 (file)
--- 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
similarity index 100%
rename from cpu/ixp/pci.c
rename to drivers/pci/pci_ixp.c

diff --git a/include/configs/ixdp425.h b/include/configs/ixdp425.h
index 35b045127cb872462483f76d4629a03724ce9229..edebb40e1d8ab07ead3f4332793d71c23f399fd9 100644 (file)
--- 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