[U-Boot-Users] [PATCH] drivers: initial tree import for drivers reorganization

Jean-Christophe PLAGNIOL-VILLARD
2007-10-11T08:32:05Z

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
Makefile | 17 +++++++++++++++++
drivers/{nand_legacy => ata}/Makefile | 11 ++++++-----
drivers/bios_emulator/Makefile | 20 ++++++++++++--------
drivers/{nand_legacy => block}/Makefile | 11 ++++++-----
drivers/{nand_legacy => char}/Makefile | 11 ++++++-----
drivers/{nand_legacy => eeprom}/Makefile | 11 ++++++-----
drivers/{nand_legacy => hwmon}/Makefile | 11 ++++++-----
drivers/{nand_legacy => i2c}/Makefile | 11 ++++++-----
drivers/{nand_legacy => ide}/Makefile | 11 ++++++-----
drivers/{nand_legacy => input}/Makefile | 11 ++++++-----
drivers/{nand_legacy => leds}/Makefile | 11 ++++++-----
drivers/{nand_legacy => misc}/Makefile | 11 ++++++-----
drivers/{nand_legacy => mtd}/Makefile | 11 ++++++-----
drivers/nand_legacy/Makefile | 3 ++-
drivers/net/Makefile | 3 ++-
drivers/{nand_legacy => pci}/Makefile | 11 ++++++-----
drivers/{nand_legacy => pcmcia}/Makefile | 11 ++++++-----
drivers/qe/Makefile | 6 +++++-
drivers/{nand_legacy => sata}/Makefile | 11 ++++++-----
drivers/{nand_legacy => scsi}/Makefile | 11 ++++++-----
drivers/serial/Makefile | 3 ++-
drivers/{nand_legacy => usb}/Makefile | 11 ++++++-----
drivers/{nand_legacy => video}/Makefile | 11 ++++++-----
23 files changed, 142 insertions(+), 97 deletions(-)
copy drivers/{nand_legacy => ata}/Makefile (88%)
copy drivers/{nand_legacy => block}/Makefile (87%)
copy drivers/{nand_legacy => char}/Makefile (87%)
copy drivers/{nand_legacy => eeprom}/Makefile (87%)
copy drivers/{nand_legacy => hwmon}/Makefile (87%)
copy drivers/{nand_legacy => i2c}/Makefile (88%)
copy drivers/{nand_legacy => ide}/Makefile (88%)
copy drivers/{nand_legacy => input}/Makefile (87%)
copy drivers/{nand_legacy => leds}/Makefile (87%)
copy drivers/{nand_legacy => misc}/Makefile (87%)
copy drivers/{nand_legacy => mtd}/Makefile (88%)
copy drivers/{nand_legacy => pci}/Makefile (88%)
copy drivers/{nand_legacy => pcmcia}/Makefile (87%)
copy drivers/{nand_legacy => sata}/Makefile (87%)
copy drivers/{nand_legacy => scsi}/Makefile (87%)
copy drivers/{nand_legacy => usb}/Makefile (88%)
copy drivers/{nand_legacy => video}/Makefile (87%)

diff --git a/Makefile b/Makefile
index 6410f08..57038e7 100644
--- a/Makefile
+++ b/Makefile
@@ -208,18 +208,35 @@ LIBS += disk/libdisk.a
LIBS += rtc/librtc.a
LIBS += dtt/libdtt.a
LIBS += drivers/libdrivers.a
+LIBS += drivers/ata/libata.a
LIBS += drivers/bios_emulator/libatibiosemu.a
+LIBS += drivers/block/libblock.a
+LIBS += drivers/char/libchar.a
+LIBS += drivers/eeprom/libeeprom.a
+LIBS += drivers/hwmon/libhwmon.a
+LIBS += drivers/i2c/libi2c.a
+LIBS += drivers/ide/libide.a
+LIBS += drivers/input/libinput.a
+LIBS += drivers/leds/libleds.a
+LIBS += drivers/misc/libmisc.a
+LIBS += drivers/mtd/libmtd.a
LIBS += drivers/nand/libnand.a
LIBS += drivers/nand_legacy/libnand_legacy.a
LIBS += drivers/net/libnet.a
+LIBS += drivers/pci/libpci.a
+LIBS += drivers/pcmcia/libpcmcia.a
ifeq ($(CPU),mpc83xx)
LIBS += drivers/qe/qe.a
endif
ifeq ($(CPU),mpc85xx)
LIBS += drivers/qe/qe.a
endif
+LIBS += drivers/sata/libsata.a
+LIBS += drivers/scsi/libscsi.a
LIBS += drivers/serial/libserial.a
LIBS += drivers/sk98lin/libsk98lin.a
+LIBS += drivers/usb/libusb.a
+LIBS += drivers/video/libvideo.a
LIBS += post/libpost.a post/drivers/libpostdrivers.a
LIBS += $(shell if [ -d post/lib_$(ARCH) ]; then echo \
"post/lib_$(ARCH)/libpost$(ARCH).a"; fi)
diff --git a/drivers/nand_legacy/Makefile b/drivers/ata/Makefile
similarity index 88%
copy from drivers/nand_legacy/Makefile
copy to drivers/ata/Makefile
index 95314d8..f93d6cb 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/ata/Makefile
@@ -1,7 +1,7 @@
#
-# (C) Copyright 2006
+# (C) Copyright 2007
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
+# Jean-Christophe PLAGNIOL-VILLARD, plagnioj at jcrosoft.com.
# See file CREDITS for list of people who contributed to this
# project.
#
@@ -23,16 +23,17 @@

include $(TOPDIR)/config.mk

-LIB := $(obj)libnand_legacy.a
+LIB := $(obj)libata.a

-COBJS := nand_legacy.o
+COBJS-y +=

+COBJS := $(COBJS-y)
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/bios_emulator/Makefile b/drivers/bios_emulator/Makefile
index 90c64da..cb0a13e 100644
--- a/drivers/bios_emulator/Makefile
+++ b/drivers/bios_emulator/Makefile
@@ -6,14 +6,18 @@ X86DIR = x86emu

$(shell mkdir -p $(obj)$(X86DIR))

-COBJS = atibios.o biosemu.o besys.o bios.o \
- $(X86DIR)/decode.o \
- $(X86DIR)/ops2.o \
- $(X86DIR)/ops.o \
- $(X86DIR)/prim_ops.o \
- $(X86DIR)/sys.o \
- $(X86DIR)/debug.o
-
+COBJS-y += atibios.o
+COBJS-y += biosemu.o
+COBJS-y += besys.o
+COBJS-y += bios.o
+COBJS-y += $(X86DIR)/decode.o
+COBJS-y += $(X86DIR)/ops2.o
+COBJS-y += $(X86DIR)/ops.o
+COBJS-y += $(X86DIR)/prim_ops.o
+COBJS-y += $(X86DIR)/sys.o
+COBJS-y += $(X86DIR)/debug.o
+
+COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))

diff --git a/drivers/nand_legacy/Makefile b/drivers/block/Makefile
similarity index 87%
copy from drivers/nand_legacy/Makefile
copy to drivers/block/Makefile
index 95314d8..254908a 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/block/Makefile
@@ -1,7 +1,7 @@
#
-# (C) Copyright 2006
+# (C) Copyright 2007
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
+# Jean-Christophe PLAGNIOL-VILLARD, plagnioj at jcrosoft.com.
# See file CREDITS for list of people who contributed to this
# project.
#
@@ -23,16 +23,17 @@

include $(TOPDIR)/config.mk

-LIB := $(obj)libnand_legacy.a
+LIB := $(obj)libblock.a

-COBJS := nand_legacy.o
+COBJS-y +=

+COBJS := $(COBJS-y)
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/nand_legacy/Makefile b/drivers/char/Makefile
similarity index 87%
copy from drivers/nand_legacy/Makefile
copy to drivers/char/Makefile
index 95314d8..ed12090 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/char/Makefile
@@ -1,7 +1,7 @@
#
-# (C) Copyright 2006
+# (C) Copyright 2007
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
+# Jean-Christophe PLAGNIOL-VILLARD, plagnioj at jcrosoft.com.
# See file CREDITS for list of people who contributed to this
# project.
#
@@ -23,16 +23,17 @@

include $(TOPDIR)/config.mk

-LIB := $(obj)libnand_legacy.a
+LIB := $(obj)libchar.a

-COBJS := nand_legacy.o
+COBJS-y +=

+COBJS := $(COBJS-y)
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/nand_legacy/Makefile b/drivers/eeprom/Makefile
similarity index 87%
copy from drivers/nand_legacy/Makefile
copy to drivers/eeprom/Makefile
index 95314d8..8188775 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/eeprom/Makefile
@@ -1,7 +1,7 @@
#
-# (C) Copyright 2006
+# (C) Copyright 2007
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
+# Jean-Christophe PLAGNIOL-VILLARD, plagnioj at jcrosoft.com.
# See file CREDITS for list of people who contributed to this
# project.
#
@@ -23,16 +23,17 @@

include $(TOPDIR)/config.mk

-LIB := $(obj)libnand_legacy.a
+LIB := $(obj)libeeprom.a

-COBJS := nand_legacy.o
+COBJS-y +=

+COBJS := $(COBJS-y)
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/nand_legacy/Makefile b/drivers/hwmon/Makefile
similarity index 87%
copy from drivers/nand_legacy/Makefile
copy to drivers/hwmon/Makefile
index 95314d8..18f816c 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/hwmon/Makefile
@@ -1,7 +1,7 @@
#
-# (C) Copyright 2006
+# (C) Copyright 2007
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
+# Jean-Christophe PLAGNIOL-VILLARD, plagnioj at jcrosoft.com.
# See file CREDITS for list of people who contributed to this
# project.
#
@@ -23,16 +23,17 @@

include $(TOPDIR)/config.mk

-LIB := $(obj)libnand_legacy.a
+LIB := $(obj)libhwmon.a

-COBJS := nand_legacy.o
+COBJS-y +=

+COBJS := $(COBJS-y)
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/nand_legacy/Makefile b/drivers/i2c/Makefile
similarity index 88%
copy from drivers/nand_legacy/Makefile
copy to drivers/i2c/Makefile
index 95314d8..7595572 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/i2c/Makefile
@@ -1,7 +1,7 @@
#
-# (C) Copyright 2006
+# (C) Copyright 2007
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
+# Jean-Christophe PLAGNIOL-VILLARD, plagnioj at jcrosoft.com.
# See file CREDITS for list of people who contributed to this
# project.
#
@@ -23,16 +23,17 @@

include $(TOPDIR)/config.mk

-LIB := $(obj)libnand_legacy.a
+LIB := $(obj)libi2c.a

-COBJS := nand_legacy.o
+COBJS-y +=

+COBJS := $(COBJS-y)
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/nand_legacy/Makefile b/drivers/ide/Makefile
similarity index 88%
copy from drivers/nand_legacy/Makefile
copy to drivers/ide/Makefile
index 95314d8..513259d 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/ide/Makefile
@@ -1,7 +1,7 @@
#
-# (C) Copyright 2006
+# (C) Copyright 2007
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
+# Jean-Christophe PLAGNIOL-VILLARD, plagnioj at jcrosoft.com.
# See file CREDITS for list of people who contributed to this
# project.
#
@@ -23,16 +23,17 @@

include $(TOPDIR)/config.mk

-LIB := $(obj)libnand_legacy.a
+LIB := $(obj)libide.a

-COBJS := nand_legacy.o
+COBJS-y +=

+COBJS := $(COBJS-y)
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/nand_legacy/Makefile b/drivers/input/Makefile
similarity index 87%
copy from drivers/nand_legacy/Makefile
copy to drivers/input/Makefile
index 95314d8..60371b3 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/input/Makefile
@@ -1,7 +1,7 @@
#
-# (C) Copyright 2006
+# (C) Copyright 2007
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
+# Jean-Christophe PLAGNIOL-VILLARD, plagnioj at jcrosoft.com.
# See file CREDITS for list of people who contributed to this
# project.
#
@@ -23,16 +23,17 @@

include $(TOPDIR)/config.mk

-LIB := $(obj)libnand_legacy.a
+LIB := $(obj)libinput.a

-COBJS := nand_legacy.o
+COBJS-y +=

+COBJS := $(COBJS-y)
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/nand_legacy/Makefile b/drivers/leds/Makefile
similarity index 87%
copy from drivers/nand_legacy/Makefile
copy to drivers/leds/Makefile
index 95314d8..0bbfb56 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/leds/Makefile
@@ -1,7 +1,7 @@
#
-# (C) Copyright 2006
+# (C) Copyright 2007
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
+# Jean-Christophe PLAGNIOL-VILLARD, plagnioj at jcrosoft.com.
# See file CREDITS for list of people who contributed to this
# project.
#
@@ -23,16 +23,17 @@

include $(TOPDIR)/config.mk

-LIB := $(obj)libnand_legacy.a
+LIB := $(obj)libleds.a

-COBJS := nand_legacy.o
+COBJS-y +=

+COBJS := $(COBJS-y)
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/nand_legacy/Makefile b/drivers/misc/Makefile
similarity index 87%
copy from drivers/nand_legacy/Makefile
copy to drivers/misc/Makefile
index 95314d8..9eb8b50 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/misc/Makefile
@@ -1,7 +1,7 @@
#
-# (C) Copyright 2006
+# (C) Copyright 2007
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
+# Jean-Christophe PLAGNIOL-VILLARD, plagnioj at jcrosoft.com.
# See file CREDITS for list of people who contributed to this
# project.
#
@@ -23,16 +23,17 @@

include $(TOPDIR)/config.mk

-LIB := $(obj)libnand_legacy.a
+LIB := $(obj)libmisc.a

-COBJS := nand_legacy.o
+COBJS-y +=

+COBJS := $(COBJS-y)
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/nand_legacy/Makefile b/drivers/mtd/Makefile
similarity index 88%
copy from drivers/nand_legacy/Makefile
copy to drivers/mtd/Makefile
index 95314d8..c0f6a06 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/mtd/Makefile
@@ -1,7 +1,7 @@
#
-# (C) Copyright 2006
+# (C) Copyright 2007
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
+# Jean-Christophe PLAGNIOL-VILLARD, plagnioj at jcrosoft.com.
# See file CREDITS for list of people who contributed to this
# project.
#
@@ -23,16 +23,17 @@

include $(TOPDIR)/config.mk

-LIB := $(obj)libnand_legacy.a
+LIB := $(obj)libmtd.a

-COBJS := nand_legacy.o
+COBJS-y +=

+COBJS := $(COBJS-y)
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/nand_legacy/Makefile b/drivers/nand_legacy/Makefile
index 95314d8..6f1283b 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/nand_legacy/Makefile
@@ -25,8 +25,9 @@ include $(TOPDIR)/config.mk

LIB := $(obj)libnand_legacy.a

-COBJS := nand_legacy.o
+COBJS-y += nand_legacy.o

+COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 37d69b9..7d115fe 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -25,8 +25,9 @@ include $(TOPDIR)/config.mk

LIB := $(obj)libnet.a

-COBJS := mcffec.o
+COBJS-y += mcffec.o

+COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))

diff --git a/drivers/nand_legacy/Makefile b/drivers/pci/Makefile
similarity index 88%
copy from drivers/nand_legacy/Makefile
copy to drivers/pci/Makefile
index 95314d8..73af31f 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/pci/Makefile
@@ -1,7 +1,7 @@
#
-# (C) Copyright 2006
+# (C) Copyright 2007
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
+# Jean-Christophe PLAGNIOL-VILLARD, plagnioj at jcrosoft.com.
# See file CREDITS for list of people who contributed to this
# project.
#
@@ -23,16 +23,17 @@

include $(TOPDIR)/config.mk

-LIB := $(obj)libnand_legacy.a
+LIB := $(obj)libpci.a

-COBJS := nand_legacy.o
+COBJS-y +=

+COBJS := $(COBJS-y)
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/nand_legacy/Makefile b/drivers/pcmcia/Makefile
similarity index 87%
copy from drivers/nand_legacy/Makefile
copy to drivers/pcmcia/Makefile
index 95314d8..39f105a 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -1,7 +1,7 @@
#
-# (C) Copyright 2006
+# (C) Copyright 2007
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
+# Jean-Christophe PLAGNIOL-VILLARD, plagnioj at jcrosoft.com.
# See file CREDITS for list of people who contributed to this
# project.
#
@@ -23,16 +23,17 @@

include $(TOPDIR)/config.mk

-LIB := $(obj)libnand_legacy.a
+LIB := $(obj)libpcmcia.a

-COBJS := nand_legacy.o
+COBJS-y +=

+COBJS := $(COBJS-y)
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/qe/Makefile b/drivers/qe/Makefile
index 4844181..900f64d 100644
--- a/drivers/qe/Makefile
+++ b/drivers/qe/Makefile
@@ -24,8 +24,12 @@ include $(TOPDIR)/config.mk

LIB := $(obj)qe.a

-COBJS := qe.o uccf.o uec.o uec_phy.o
+COBJS-y += qe.o
+COBJS-y += uccf.o
+COBJS-y += uec.o
+COBJS-y += uec_phy.o

+COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))

diff --git a/drivers/nand_legacy/Makefile b/drivers/sata/Makefile
similarity index 87%
copy from drivers/nand_legacy/Makefile
copy to drivers/sata/Makefile
index 95314d8..6fab412 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/sata/Makefile
@@ -1,7 +1,7 @@
#
-# (C) Copyright 2006
+# (C) Copyright 2007
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
+# Jean-Christophe PLAGNIOL-VILLARD, plagnioj at jcrosoft.com.
# See file CREDITS for list of people who contributed to this
# project.
#
@@ -23,16 +23,17 @@

include $(TOPDIR)/config.mk

-LIB := $(obj)libnand_legacy.a
+LIB := $(obj)libsata.a

-COBJS := nand_legacy.o
+COBJS-y +=

+COBJS := $(COBJS-y)
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/nand_legacy/Makefile b/drivers/scsi/Makefile
similarity index 87%
copy from drivers/nand_legacy/Makefile
copy to drivers/scsi/Makefile
index 95314d8..b6db6d3 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/scsi/Makefile
@@ -1,7 +1,7 @@
#
-# (C) Copyright 2006
+# (C) Copyright 2007
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
+# Jean-Christophe PLAGNIOL-VILLARD, plagnioj at jcrosoft.com.
# See file CREDITS for list of people who contributed to this
# project.
#
@@ -23,16 +23,17 @@

include $(TOPDIR)/config.mk

-LIB := $(obj)libnand_legacy.a
+LIB := $(obj)libscsi.a

-COBJS := nand_legacy.o
+COBJS-y +=

+COBJS := $(COBJS-y)
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/serial/Makefile b/drivers/serial/Makefile
index 93c68dd..fe3ade3 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -25,8 +25,9 @@ include $(TOPDIR)/config.mk

LIB := $(obj)libserial.a

-COBJS := mcfuart.o
+COBJS-y += mcfuart.o

+COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))

diff --git a/drivers/nand_legacy/Makefile b/drivers/usb/Makefile
similarity index 88%
copy from drivers/nand_legacy/Makefile
copy to drivers/usb/Makefile
index 95314d8..e151fe5 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/usb/Makefile
@@ -1,7 +1,7 @@
#
-# (C) Copyright 2006
+# (C) Copyright 2007
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
+# Jean-Christophe PLAGNIOL-VILLARD, plagnioj at jcrosoft.com.
# See file CREDITS for list of people who contributed to this
# project.
#
@@ -23,16 +23,17 @@

include $(TOPDIR)/config.mk

-LIB := $(obj)libnand_legacy.a
+LIB := $(obj)libusb.a

-COBJS := nand_legacy.o
+COBJS-y +=

+COBJS := $(COBJS-y)
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/nand_legacy/Makefile b/drivers/video/Makefile
similarity index 87%
copy from drivers/nand_legacy/Makefile
copy to drivers/video/Makefile
index 95314d8..f26ead9 100644
--- a/drivers/nand_legacy/Makefile
+++ b/drivers/video/Makefile
@@ -1,7 +1,7 @@
#
-# (C) Copyright 2006
+# (C) Copyright 2007
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
+# Jean-Christophe PLAGNIOL-VILLARD, plagnioj at jcrosoft.com.
# See file CREDITS for list of people who contributed to this
# project.
#
@@ -23,16 +23,17 @@

include $(TOPDIR)/config.mk

-LIB := $(obj)libnand_legacy.a
+LIB := $(obj)libvideo.a

-COBJS := nand_legacy.o
+COBJS-y +=

+COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))

all: $(LIB)

-$(LIB): $(obj).depend $(OBJS)
+$(LIB): $(obj).depend $(OBJS)
$(AR) $(ARFLAGS) $@ $(OBJS)

#########################################################################
--
1.5.3.2