[U-Boot-Users] [PATCH 10/14] drivers/block : move block drivers to drivers/block

[Jean-Christophe PLAGNIOL-VILLARD]

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

diff --git a/Makefile b/Makefile
index cde4490..1b27290 100644
--- a/Makefile
+++ b/Makefile
@@ -207,6 +207,7 @@ LIBS += net/libnet.a
 LIBS += disk/libdisk.a
 LIBS += drivers/libdrivers.a
 LIBS += drivers/bios_emulator/libatibiosemu.a
+LIBS += drivers/block/libblock.a
 LIBS += drivers/hwmon/libhwmon.a
 LIBS += drivers/i2c/libi2c.a
 LIBS += drivers/input/libinput.a
diff --git a/drivers/Makefile b/drivers/Makefile
index d4882f5..6a623e3 100755
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -34,15 +34,10 @@ COBJS-y += status_led.o
 #
 # Block and Flash Drivers
 #
-COBJS-y += ahci.o
 COBJS-y += at45.o
-COBJS-y += ata_piix.o
 COBJS-y += cfi_flash.o
 COBJS-y += dataflash.o
 COBJS-y += mw_eeprom.o
-COBJS-y += sil680.o
-COBJS-y += sym53c8xx.o
-COBJS-y += systemace.o
 
 #
 # Miscellaneous Drivers
diff --git a/drivers/Makefile b/drivers/block/Makefile
old mode 100755
new mode 100644
similarity index 75%
copy from drivers/Makefile
copy to drivers/block/Makefile
index d4882f5..e069969
--- a/drivers/Makefile
+++ b/drivers/block/Makefile
@@ -23,41 +23,21 @@
 
 include $(TOPDIR)/config.mk
 
-# CFLAGS += -DET_DEBUG -DDEBUG
+LIB 	:= $(obj)libblock.a
 
-LIB	= $(obj)libdrivers.a
-
-COBJS-y += ali512x.o
-COBJS-y += ns87308.o
-COBJS-y += status_led.o
-
-#
-# Block and Flash Drivers
-#
 COBJS-y += ahci.o
-COBJS-y += at45.o
 COBJS-y += ata_piix.o
-COBJS-y += cfi_flash.o
-COBJS-y += dataflash.o
-COBJS-y += mw_eeprom.o
 COBJS-y += sil680.o
 COBJS-y += sym53c8xx.o
 COBJS-y += systemace.o
 
-#
-# Miscellaneous Drivers
-#
-COBJS-y += ali512x.o
-COBJS-y += ns87308.o
-COBJS-y += status_led.o
-
 COBJS	:= $(COBJS-y)
-SRCS	:= $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS))
+SRCS 	:= $(COBJS:.o=.c)
+OBJS 	:= $(addprefix $(obj),$(COBJS))
 
 all:	$(LIB)
 
-$(LIB): $(obj).depend $(OBJS)
+$(LIB):	$(obj).depend $(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS)
 
 #########################################################################
diff --git a/drivers/ahci.c b/drivers/block/ahci.c
similarity index 100%
rename from drivers/ahci.c
rename to drivers/block/ahci.c
diff --git a/drivers/ata_piix.c b/drivers/block/ata_piix.c
similarity index 100%
rename from drivers/ata_piix.c
rename to drivers/block/ata_piix.c
diff --git a/drivers/sil680.c b/drivers/block/sil680.c
similarity index 100%
rename from drivers/sil680.c
rename to drivers/block/sil680.c
diff --git a/drivers/sym53c8xx.c b/drivers/block/sym53c8xx.c
similarity index 100%
rename from drivers/sym53c8xx.c
rename to drivers/block/sym53c8xx.c
diff --git a/drivers/systemace.c b/drivers/block/systemace.c
similarity index 100%
rename from drivers/systemace.c
rename to drivers/block/systemace.c
-- 
1.5.3.2