drivers/pci : move pci drivers to drivers/pci

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

diff --git a/Makefile b/Makefile
index 78ae92400d244872c27981b5dd6132487b569eff..43f8bf697e7acab7ae93a481ed539a22b44b2d85 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -208,6 +208,7 @@ LIBS += disk/libdisk.a
 LIBS += rtc/librtc.a
 LIBS += dtt/libdtt.a
 LIBS += drivers/i2c/libi2c.a
+LIBS += drivers/pci/libpci.a
 LIBS += drivers/libdrivers.a
 LIBS += drivers/bios_emulator/libatibiosemu.a
 LIBS += drivers/nand/libnand.a

diff --git a/drivers/Makefile b/drivers/Makefile
index 7b524e4a4d4d6b2d9de15dc40f000751d91dd379..f775371c0bd203667397e5eeb53385ad7b27d0a4 100755 (executable)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -105,17 +105,11 @@ COBJS-y += uli526x.o
 #
 # PCI/PCMCIA device drivers
 #
-COBJS-y += fsl_pci_init.o
 COBJS-y += mpc8xx_pcmcia.o
-COBJS-y += pci.o
-COBJS-y += pci_auto.o
-COBJS-y += pci_indirect.o
 COBJS-y += pxa_pcmcia.o
 COBJS-y += rpx_pcmcia.o
 COBJS-y += ti_pci1410a.o
 COBJS-y += tqm8xx_pcmcia.o
-COBJS-y += tsi108_pci.o
-COBJS-y += w83c553f.o
 
 #
 # USB Drivers

diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
new file mode 100644 (file)
index 0000000..fe45839
--- /dev/null
+++ b/drivers/pci/Makefile
@@ -0,0 +1,51 @@
+#
+# (C) Copyright 2000-2007
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB    := $(obj)libpci.a
+
+COBJS-y += fsl_pci_init.o
+COBJS-y += pci.o
+COBJS-y += pci_auto.o
+COBJS-y += pci_indirect.o
+COBJS-y += tsi108_pci.o
+COBJS-y += w83c553f.o
+
+COBJS  := $(COBJS-y)
+SRCS   := $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS))
+
+all:   $(LIB)
+
+$(LIB):        $(obj).depend $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################

diff --git a/drivers/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
similarity index 100%
rename from drivers/fsl_pci_init.c
rename to drivers/pci/fsl_pci_init.c

diff --git a/drivers/pci.c b/drivers/pci/pci.c
similarity index 100%
rename from drivers/pci.c
rename to drivers/pci/pci.c

diff --git a/drivers/pci_auto.c b/drivers/pci/pci_auto.c
similarity index 100%
rename from drivers/pci_auto.c
rename to drivers/pci/pci_auto.c

diff --git a/drivers/pci_indirect.c b/drivers/pci/pci_indirect.c
similarity index 100%
rename from drivers/pci_indirect.c
rename to drivers/pci/pci_indirect.c

diff --git a/drivers/tsi108_pci.c b/drivers/pci/tsi108_pci.c
similarity index 100%
rename from drivers/tsi108_pci.c
rename to drivers/pci/tsi108_pci.c

diff --git a/drivers/w83c553f.c b/drivers/pci/w83c553f.c
similarity index 100%
rename from drivers/w83c553f.c
rename to drivers/pci/w83c553f.c