Merge commit '87ddedd'

diff --combined Makefile
index 407b9387002ea427370961f27c3b0a5f96912c38,dbd7d4fb3af9d2c407f5dcdd0d95b1c0edccd7b4..f1f3e4bdd316828da68f083fc1a20467a0e71bee
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -205,22 -205,30 +205,30 @@@ LIBS += fs/cramfs/libcramfs.a fs/fat/li
        fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a
  LIBS += net/libnet.a
  LIBS += disk/libdisk.a
- LIBS += rtc/librtc.a
- LIBS += dtt/libdtt.a
- LIBS += drivers/libdrivers.a
  LIBS += drivers/bios_emulator/libatibiosemu.a
- LIBS += drivers/nand/libnand.a
- LIBS += drivers/nand_legacy/libnand_legacy.a
- LIBS += drivers/onenand/libonenand.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/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/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/rtc/librtc.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)
@@@ -327,14 -335,26 +335,26 @@@ tags ctags
                ctags -w -o $(OBJTREE)/ctags `find $(SUBDIRS) include \
                                lib_generic board/$(BOARDDIR) cpu/$(CPU) lib_$(ARCH) \
                                fs/cramfs fs/fat fs/fdos fs/jffs2 \
-                               net disk rtc dtt drivers drivers/sk98lin common \
+                               net disk common drivers/bios_emulator \
+                               drivers/block drivers/hwmon drivers/i2c \
+                               drivers/input drivers/misc drivers/mtd \
+                               drivers/mtd/nand drivers/mtd/nand_legacy \
+                               drivers/mtd/onenand drivers/net drivers/net/sk98lin \
+                               drivers/pci drivers/pcmcia drivers/qe drivers/rtc \
+                               drivers/serial drivers/usb drivers/video \
                        \( -name CVS -prune \) -o \( -name '*.[ch]' -print \)`
  
  etags:
                etags -a -o $(OBJTREE)/etags `find $(SUBDIRS) include \
                                lib_generic board/$(BOARDDIR) cpu/$(CPU) lib_$(ARCH) \
                                fs/cramfs fs/fat fs/fdos fs/jffs2 \
-                               net disk rtc dtt drivers drivers/sk98lin common \
+                               net disk common drivers/bios_emulator \
+                               drivers/block drivers/hwmon drivers/i2c \
+                               drivers/input drivers/misc drivers/mtd \
+                               drivers/mtd/nand drivers/mtd/nand_legacy \
+                               drivers/mtd/onenand drivers/net drivers/net/sk98lin \
+                               drivers/pci drivers/pcmcia drivers/qe drivers/rtc \
+                               drivers/serial drivers/usb drivers/video \
                        \( -name CVS -prune \) -o \( -name '*.[ch]' -print \)`
  
  $(obj)System.map:     $(obj)u-boot
@@@ -342,21 -362,6 +362,21 @@@
                grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
                sort > $(obj)System.map
  
 +#
 +# Auto-generate the autoconf.mk file (which is included by all makefiles)
 +#
 +# This target actually generates 2 files; autoconf.mk and autoconf.mk.dep.
 +# the dep file is only include in this top level makefile to determine when
 +# to regenerate the autoconf.mk file.
 +$(OBJTREE)/include/autoconf.mk: $(obj)include/config.h
 +      @echo Generating include/autoconf.mk
 +      @# Generate the dependancies
 +      @$(CC) -M $(HOST_CFLAGS) $(CPPFLAGS) -MQ $@ include/common.h > $@.dep
 +      @# Extract the config macros
 +      @$(CPP) $(CFLAGS) -dM include/common.h | sed -n -f tools/scripts/define2mk.sed >> $@
 +
 +sinclude $(OBJTREE)/include/autoconf.mk.dep
 +
  #########################################################################
  else
  all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
@@@ -376,8 -381,7 +396,8 @@@ CHANGELOG
  
  unconfig:
        @rm -f $(obj)include/config.h $(obj)include/config.mk \
 -              $(obj)board/*/config.tmp $(obj)board/*/*/config.tmp
 +              $(obj)board/*/config.tmp $(obj)board/*/*/config.tmp \
 +              $(obj)include/autoconf.mk $(obj)include/autoconf.mk.dep
  
  #========================================================================
  # PowerPC