Merge with git+ssh://gemini_vpn/home/wd/git/u-boot/master

diff --combined Makefile
index 011f730,a87311c..e74ff36
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -319,7 -319,7 +319,7 @@@ updater
  env:
                $(MAKE) -C tools/env all || exit 1
  
 -depend dep:
 +depend dep:   version
                for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir _depend ; done
  
  tags ctags:
@@@ -1961,7 -1961,7 +1961,7 @@@ TQM8560_config:         unconfi
        echo "#define CONFIG_TQM$${CTYPE}">>$(obj)include/config.h; \
        echo "#define CONFIG_HOSTNAME tqm$${CTYPE}">>$(obj)include/config.h; \
        echo "#define CONFIG_BOARDNAME \"TQM$${CTYPE}\"">>$(obj)include/config.h; \
-       echo "#define CFG_BOOTFILE \"bootfile=/tftpboot/tqm$${CTYPE}/uImage\0\"">>$(obj)include/config.h
+       echo "#define CFG_BOOTFILE_PATH \"/tftpboot/tqm$${CTYPE}/uImage\"">>$(obj)include/config.h
        @$(MKCONFIG) -a TQM85xx ppc mpc85xx tqm85xx
  
  #########################################################################