diff options
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r--[-rwxr-xr-x] | drivers/mtd/Makefile (renamed from drivers/Makefile) | 13 | ||||
| -rw-r--r-- | drivers/mtd/at45.c (renamed from drivers/at45.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/cfi_flash.c (renamed from drivers/cfi_flash.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/dataflash.c (renamed from drivers/dataflash.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/mw_eeprom.c (renamed from drivers/mw_eeprom.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand/Makefile (renamed from drivers/nand/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand/diskonchip.c (renamed from drivers/nand/diskonchip.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand.c (renamed from drivers/nand/nand.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_base.c (renamed from drivers/nand/nand_base.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_bbt.c (renamed from drivers/nand/nand_bbt.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_ecc.c (renamed from drivers/nand/nand_ecc.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_ids.c (renamed from drivers/nand/nand_ids.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_util.c (renamed from drivers/nand/nand_util.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand_legacy/Makefile (renamed from drivers/nand_legacy/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand_legacy/nand_legacy.c (renamed from drivers/nand_legacy/nand_legacy.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/onenand/Makefile (renamed from drivers/onenand/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/mtd/onenand/onenand_base.c (renamed from drivers/onenand/onenand_base.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/onenand/onenand_bbt.c (renamed from drivers/onenand/onenand_bbt.c) | 0 | ||||
| -rw-r--r-- | nand_spl/board/amcc/acadia/Makefile | 2 | ||||
| -rw-r--r-- | nand_spl/board/amcc/bamboo/Makefile | 2 | ||||
| -rw-r--r-- | nand_spl/board/amcc/sequoia/Makefile | 2 |
22 files changed, 15 insertions, 20 deletions
@@ -205,30 +205,30 @@ LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a 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 LIBS += drivers/misc/libmisc.a -LIBS += drivers/nand/libnand.a -LIBS += drivers/nand_legacy/libnand_legacy.a +LIBS += drivers/mtd/libmtd.a +LIBS += drivers/mtd/nand/libnand.a +LIBS += drivers/mtd/nand_legacy/libnand_legacy.a +LIBS += drivers/mtd/onenand/libonenand.a LIBS += drivers/net/libnet.a LIBS += drivers/net/sk98lin/libsk98lin.a -LIBS += drivers/onenand/libonenand.a LIBS += drivers/pci/libpci.a LIBS += drivers/pcmcia/libpcmcia.a -LIBS += drivers/rtc/librtc.a -LIBS += drivers/serial/libserial.a -LIBS += drivers/usb/libusb.a -LIBS += drivers/video/libvideo.a ifeq ($(CPU),mpc83xx) LIBS += drivers/qe/qe.a endif ifeq ($(CPU),mpc85xx) LIBS += drivers/qe/qe.a endif +LIBS += drivers/rtc/librtc.a +LIBS += drivers/serial/libserial.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/Makefile b/drivers/mtd/Makefile index d596a4ee3b..95c5e02af9 100755..100644 --- a/drivers/Makefile +++ b/drivers/mtd/Makefile @@ -23,25 +23,20 @@ include $(TOPDIR)/config.mk -# CFLAGS += -DET_DEBUG -DDEBUG +LIB := $(obj)libmtd.a -LIB = $(obj)libdrivers.a - -# -# Block and Flash Drivers -# COBJS-y += at45.o COBJS-y += cfi_flash.o COBJS-y += dataflash.o COBJS-y += mw_eeprom.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/at45.c b/drivers/mtd/at45.c index dac987a43a..dac987a43a 100644 --- a/drivers/at45.c +++ b/drivers/mtd/at45.c diff --git a/drivers/cfi_flash.c b/drivers/mtd/cfi_flash.c index 5579a1efc1..5579a1efc1 100644 --- a/drivers/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c diff --git a/drivers/dataflash.c b/drivers/mtd/dataflash.c index 91903c8c8f..91903c8c8f 100644 --- a/drivers/dataflash.c +++ b/drivers/mtd/dataflash.c diff --git a/drivers/mw_eeprom.c b/drivers/mtd/mw_eeprom.c index 2b3348810d..2b3348810d 100644 --- a/drivers/mw_eeprom.c +++ b/drivers/mtd/mw_eeprom.c diff --git a/drivers/nand/Makefile b/drivers/mtd/nand/Makefile index 42864f98f4..42864f98f4 100644 --- a/drivers/nand/Makefile +++ b/drivers/mtd/nand/Makefile diff --git a/drivers/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c index e17af70d07..e17af70d07 100644 --- a/drivers/nand/diskonchip.c +++ b/drivers/mtd/nand/diskonchip.c diff --git a/drivers/nand/nand.c b/drivers/mtd/nand/nand.c index 27b5792bcc..27b5792bcc 100644 --- a/drivers/nand/nand.c +++ b/drivers/mtd/nand/nand.c diff --git a/drivers/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 151f535c58..151f535c58 100644 --- a/drivers/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c diff --git a/drivers/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index 19a9bc2a5b..19a9bc2a5b 100644 --- a/drivers/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c diff --git a/drivers/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c index 4c532b0794..4c532b0794 100644 --- a/drivers/nand/nand_ecc.c +++ b/drivers/mtd/nand/nand_ecc.c diff --git a/drivers/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c index 6d7e347fba..6d7e347fba 100644 --- a/drivers/nand/nand_ids.c +++ b/drivers/mtd/nand/nand_ids.c diff --git a/drivers/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index 4fd4e166e6..4fd4e166e6 100644 --- a/drivers/nand/nand_util.c +++ b/drivers/mtd/nand/nand_util.c diff --git a/drivers/nand_legacy/Makefile b/drivers/mtd/nand_legacy/Makefile index 95314d80ba..95314d80ba 100644 --- a/drivers/nand_legacy/Makefile +++ b/drivers/mtd/nand_legacy/Makefile diff --git a/drivers/nand_legacy/nand_legacy.c b/drivers/mtd/nand_legacy/nand_legacy.c index 49d2ebb67d..49d2ebb67d 100644 --- a/drivers/nand_legacy/nand_legacy.c +++ b/drivers/mtd/nand_legacy/nand_legacy.c diff --git a/drivers/onenand/Makefile b/drivers/mtd/onenand/Makefile index 2049413327..2049413327 100644 --- a/drivers/onenand/Makefile +++ b/drivers/mtd/onenand/Makefile diff --git a/drivers/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index 7983a4a0d8..7983a4a0d8 100644 --- a/drivers/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c diff --git a/drivers/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c index 5a610ee5ea..5a610ee5ea 100644 --- a/drivers/onenand/onenand_bbt.c +++ b/drivers/mtd/onenand/onenand_bbt.c diff --git a/nand_spl/board/amcc/acadia/Makefile b/nand_spl/board/amcc/acadia/Makefile index 926476f91b..2d4d6016eb 100644 --- a/nand_spl/board/amcc/acadia/Makefile +++ b/nand_spl/board/amcc/acadia/Makefile @@ -96,7 +96,7 @@ $(obj)nand_boot.c: # from drivers/nand directory $(obj)nand_ecc.c: @rm -f $(obj)nand_ecc.c - ln -s $(SRCTREE)/drivers/nand/nand_ecc.c $(obj)nand_ecc.c + ln -s $(SRCTREE)/drivers/mtd/nand/nand_ecc.c $(obj)nand_ecc.c ######################################################################### diff --git a/nand_spl/board/amcc/bamboo/Makefile b/nand_spl/board/amcc/bamboo/Makefile index 8b5461dcf4..3a633fb887 100644 --- a/nand_spl/board/amcc/bamboo/Makefile +++ b/nand_spl/board/amcc/bamboo/Makefile @@ -82,7 +82,7 @@ $(obj)nand_boot.c: # from drivers/nand directory $(obj)nand_ecc.c: @rm -f $(obj)nand_ecc.c - ln -s $(SRCTREE)/drivers/nand/nand_ecc.c $(obj)nand_ecc.c + ln -s $(SRCTREE)/drivers/mtd/nand/nand_ecc.c $(obj)nand_ecc.c ifneq ($(OBJTREE), $(SRCTREE)) $(obj)sdram.c: diff --git a/nand_spl/board/amcc/sequoia/Makefile b/nand_spl/board/amcc/sequoia/Makefile index ec1be5a768..78bf071f59 100644 --- a/nand_spl/board/amcc/sequoia/Makefile +++ b/nand_spl/board/amcc/sequoia/Makefile @@ -88,7 +88,7 @@ $(obj)nand_boot.c: # from drivers/nand directory $(obj)nand_ecc.c: @rm -f $(obj)nand_ecc.c - ln -s $(SRCTREE)/drivers/nand/nand_ecc.c $(obj)nand_ecc.c + ln -s $(SRCTREE)/drivers/mtd/nand/nand_ecc.c $(obj)nand_ecc.c ######################################################################### |