Merge commit '3deca9d'

Conflicts:

	Makefile

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --combined Makefile
index f1f3e4bdd316828da68f083fc1a20467a0e71bee,37b8db6945d75b21de0cbbbad4238f21ed6c1b81..bfd4132c1527d35a5f66cf27c5be183d0fc43738
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -331,52 -331,50 +331,65 @@@ env
  depend dep:   version
                for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir _depend ; done
  
+ TAG_SUBDIRS += include
+ TAG_SUBDIRS += lib_generic board/$(BOARDDIR)
+ TAG_SUBDIRS += cpu/$(CPU)
+ TAG_SUBDIRS += lib_$(ARCH)
+ TAG_SUBDIRS += fs/cramfs
+ TAG_SUBDIRS += fs/fat
+ TAG_SUBDIRS += fs/fdos
+ TAG_SUBDIRS += fs/jffs2
+ TAG_SUBDIRS += net
+ TAG_SUBDIRS += disk
+ TAG_SUBDIRS += common
+ TAG_SUBDIRS += drivers/bios_emulator
+ TAG_SUBDIRS += drivers/block
+ TAG_SUBDIRS += drivers/hwmon
+ TAG_SUBDIRS += drivers/i2c
+ TAG_SUBDIRS += drivers/input
+ TAG_SUBDIRS += drivers/misc
+ TAG_SUBDIRS += drivers/mtd
+ TAG_SUBDIRS += drivers/mtd/nand
+ TAG_SUBDIRS += drivers/mtd/nand_legacy
+ TAG_SUBDIRS += drivers/mtd/onenand
+ TAG_SUBDIRS += drivers/net
+ TAG_SUBDIRS += drivers/net/sk98lin
+ TAG_SUBDIRS += drivers/pci
+ TAG_SUBDIRS += drivers/pcmcia
+ TAG_SUBDIRS += drivers/qe
+ TAG_SUBDIRS += drivers/rtc
+ TAG_SUBDIRS += drivers/serial
+ TAG_SUBDIRS += drivers/usb
+ TAG_SUBDIRS += drivers/video
+ 
  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 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 \)`
+               ctags -w -o $(OBJTREE)/ctags `find $(SUBDIRS) $(TAG_SUBDIRS) \
 -                      \( -name CVS -prune \) -o \( -name '*.[ch]' -print \)`
++                                              -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 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 -a -o $(OBJTREE)/etags `find $(SUBDIRS) $(TAG_SUBDIRS) \
 -                      \( -name CVS -prune \) -o \( -name '*.[ch]' -print \)`
++                                              -name '*.[ch]' -print`
  
  $(obj)System.map:     $(obj)u-boot
                @$(NM) $< | \
                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 \
@@@ -396,8 -394,7 +409,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