[U-Boot] [PATCH 2/5] ixp: move pci drivers to drivers/pci

[Jean-Christophe PLAGNIOL-VILLARD]

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

diff --git a/cpu/ixp/Makefile b/cpu/ixp/Makefile
index afa972a..6deecd4 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 bffb1eb..0c4fa80 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
similarity index 100%
rename from cpu/ixp/pci.c
rename to drivers/pci/pci_ixp.c
diff --git a/include/configs/actux1.h b/include/configs/actux1.h
index a3b04b1..677a1ba 100644
--- a/include/configs/actux1.h
+++ b/include/configs/actux1.h
@@ -65,6 +65,7 @@
 #define CONFIG_CMD_ELF
 #undef CONFIG_CMD_PCI
 #undef CONFIG_PCI
+#undef CONFIG_IXP_PCI
 
 #define CONFIG_BOOTCOMMAND		"run boot_flash"
 /* enable passing of ATAGs */
diff --git a/include/configs/actux2.h b/include/configs/actux2.h
index 7e6e8f2..ed3fc00 100644
--- a/include/configs/actux2.h
+++ b/include/configs/actux2.h
@@ -56,6 +56,7 @@
 #define CONFIG_CMD_ELF
 #undef CONFIG_CMD_PCI
 #undef CONFIG_PCI
+#undef CONFIG_IXP_PCI
 
 #define CONFIG_BOOTCOMMAND		"run boot_flash"
 /* enable passing of ATAGs */
diff --git a/include/configs/ixdp425.h b/include/configs/ixdp425.h
index 35b0451..edebb40 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
 
-- 
1.5.6.5