Merge branch 'master' into next

diff --combined MAINTAINERS
index 40868310bbab87fc06774d0045e44011bfa0114d,60def0c34d7775cb6b3cfbe610a224da075d2bf2..d07fe86129fab0b6381cad21278e0f98413d9559
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -374,7 -374,6 +374,7 @@@ Heiko Schocher <hs@denx.de
  
        ids8247         MPC8247
        jupiter         MPC5200
 +      kmeter1         MPC8360
        mgcoge          MPC8247
        mgsuvd          MPC852
        mucmc52         MPC5200
@@@ -412,6 -411,10 +412,10 @@@ Rune Torgersen <runet@innovsys.com
  
        MPC8266ADS      MPC8266
  
+ Peter Tyser <ptyser@xes-inc.com>
+ 
+       XPEDITE5200     MPC8548
+       XPEDITE5370     MPC8572
  
  David Updegraff <dave@cray.com>
  
@@@ -705,7 -708,6 +709,6 @@@ Yasushi Shoji <yashi@atmark-techno.com
  Michal Simek <monstr@monstr.eu>
  
        ML401           MicroBlaze
-       XUPV2P          MicroBlaze
  
  #########################################################################
  # Coldfire Systems:                                                   #

diff --combined MAKEALL
index a4e38ceff73c1f3da2f292351d24c31995de13cd,5ce3f3112c94ad251586801741bcfa96acf8fddb..3e8c56b4fd059207ebaef45a7403664474ff385e
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -1,6 -1,15 +1,15 @@@
  #!/bin/sh
  
- : ${JOBS:=}
+ # Determine number of CPU cores if no default was set
+ : ${BUILD_NCPUS:="`getconf _NPROCESSORS_ONLN`"}
+ 
+ if [ "$BUILD_NCPUS" -gt 1 ]
+ then
+       JOBS=-j`expr "$BUILD_NCPUS" + 1`
+ else
+       JOBS=""
+ fi
+ 
  
  if [ "${CROSS_COMPILE}" ] ; then
        MAKE="make CROSS_COMPILE=${CROSS_COMPILE}"
@@@ -326,7 -335,6 +335,7 @@@ LIST_8260="                
  #########################################################################
  
  LIST_83xx="           \
 +      kmeter1         \
        MPC8313ERDB_33  \
        MPC8313ERDB_NAND_66     \
        MPC8315ERDB     \
@@@ -377,6 -385,8 +386,8 @@@ LIST_85xx="                
        TQM8548         \
        TQM8555         \
        TQM8560         \
+       XPEDITE5200     \
+       XPEDITE5370     \
  "
  
  #########################################################################
@@@ -690,7 -700,6 +701,6 @@@ LIST_nios2="               
  LIST_microblaze="     \
        ml401           \
        suzaku          \
-       xupv2p          \
  "
  
  #########################################################################

diff --combined Makefile
index 1fe8f70215be2fa0bef1e9e5bc20fbe72660f986,d533564d9af051eb835cecaad5f8b3f917f89cac..294efef943f99cf96bcaadf888d1257a67c061d8
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -21,8 -21,8 +21,8 @@@
  # MA 02111-1307 USA
  #
  
- VERSION = 2008
- PATCHLEVEL = 10
+ VERSION = 2009
+ PATCHLEVEL = 01
  SUBLEVEL =
  EXTRAVERSION =
  ifneq "$(SUBLEVEL)" ""
@@@ -30,6 -30,7 +30,7 @@@ U_BOOT_VERSION = $(VERSION).$(PATCHLEVE
  else
  U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL)$(EXTRAVERSION)
  endif
+ TIMESTAMP_FILE = $(obj)include/timestamp_autogenerated.h
  VERSION_FILE = $(obj)include/version_autogenerated.h
  
  HOSTARCH := $(shell uname -m | \
@@@ -44,7 -45,12 +45,12 @@@
  HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \
            sed -e 's/\(cygwin\).*/cygwin/')
  
- export        HOSTARCH HOSTOS
+ # Set shell to bash if possible, otherwise fall back to sh
+ SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
+       else if [ -x /bin/bash ]; then echo /bin/bash; \
+       else echo sh; fi; fi)
+ 
+ export        HOSTARCH HOSTOS SHELL
  
  # Deal with colliding definitions from tcsh etc.
  VENDOR=
@@@ -221,6 -227,8 +227,8 @@@ LIBS += disk/libdisk.
  LIBS += drivers/bios_emulator/libatibiosemu.a
  LIBS += drivers/block/libblock.a
  LIBS += drivers/dma/libdma.a
+ LIBS += drivers/fpga/libfpga.a
+ LIBS += drivers/gpio/libgpio.a
  LIBS += drivers/hwmon/libhwmon.a
  LIBS += drivers/i2c/libi2c.a
  LIBS += drivers/input/libinput.a
@@@ -230,6 -238,7 +238,7 @@@ LIBS += drivers/mtd/libmtd.
  LIBS += drivers/mtd/nand/libnand.a
  LIBS += drivers/mtd/nand_legacy/libnand_legacy.a
  LIBS += drivers/mtd/onenand/libonenand.a
+ LIBS += drivers/mtd/ubi/libubi.a
  LIBS += drivers/mtd/spi/libspi_flash.a
  LIBS += drivers/net/libnet.a
  LIBS += drivers/net/phy/libphy.a
@@@ -259,7 -268,7 +268,7 @@@ LIBS += api/libapi.
  LIBS += post/libpost.a
  
  LIBS := $(addprefix $(obj),$(LIBS))
- .PHONY : $(LIBS) $(VERSION_FILE)
+ .PHONY : $(LIBS) $(TIMESTAMP_FILE) $(VERSION_FILE)
  
  LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).a
  LIBBOARD := $(addprefix $(obj),$(LIBBOARD))
@@@ -339,7 -348,7 +348,7 @@@ $(obj)u-boot:              depend $(SUBDIRS) $(OBJS
  $(OBJS):      depend $(obj)include/autoconf.mk
                $(MAKE) -C cpu/$(CPU) $(if $(REMOTE_BUILD),$@,$(notdir $@))
  
- $(LIBS):      depend $(obj)include/autoconf.mk
+ $(LIBS):      depend $(obj)include/autoconf.mk $(SUBDIRS)
                $(MAKE) -C $(dir $(subst $(obj),,$@))
  
  $(LIBBOARD):  depend $(LIBS) $(obj)include/autoconf.mk
@@@ -351,13 -360,13 +360,13 @@@ $(SUBDIRS):     depend $(obj)include/autoco
  $(LDSCRIPT):  depend $(obj)include/autoconf.mk
                $(MAKE) -C $(dir $@) $(notdir $@)
  
- $(NAND_SPL):  $(VERSION_FILE) $(obj)include/autoconf.mk
+ $(NAND_SPL):  $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk
                $(MAKE) -C nand_spl/board/$(BOARDDIR) all
  
  $(U_BOOT_NAND):       $(NAND_SPL) $(obj)u-boot.bin $(obj)include/autoconf.mk
                cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
  
- $(ONENAND_IPL):       $(VERSION_FILE) $(obj)include/autoconf.mk
+ $(ONENAND_IPL):       $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk
                $(MAKE) -C onenand_ipl/board/$(BOARDDIR) all
  
  $(U_BOOT_ONENAND):    $(ONENAND_IPL) $(obj)u-boot.bin $(obj)include/autoconf.mk
@@@ -366,10 -375,13 +375,13 @@@
  
  $(VERSION_FILE):
                @( printf '#define U_BOOT_VERSION "U-Boot %s%s"\n' "$(U_BOOT_VERSION)" \
-                '$(shell $(CONFIG_SHELL) $(TOPDIR)/tools/setlocalversion $(TOPDIR))' \
-                ) > $@.tmp
+                '$(shell $(TOPDIR)/tools/setlocalversion $(TOPDIR))' ) > $@.tmp
                @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
  
+ $(TIMESTAMP_FILE):
+               @date +'#define U_BOOT_DATE "%b %d %C%y"' > $@
+               @date +'#define U_BOOT_TIME "%T"' >> $@
+ 
  gdbtools:
                $(MAKE) -C tools/gdb all || exit 1
  
@@@ -379,7 -391,7 +391,7 @@@ updater
  env:
                $(MAKE) -C tools/env all MTD_VERSION=${MTD_VERSION} || exit 1
  
- depend dep:   $(VERSION_FILE)
+ depend dep:   $(TIMESTAMP_FILE) $(VERSION_FILE)
                for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir _depend ; done
  
  TAG_SUBDIRS += include
@@@ -396,6 -408,7 +408,7 @@@ TAG_SUBDIRS += dis
  TAG_SUBDIRS += common
  TAG_SUBDIRS += drivers/bios_emulator
  TAG_SUBDIRS += drivers/block
+ TAG_SUBDIRS += drivers/gpio
  TAG_SUBDIRS += drivers/hwmon
  TAG_SUBDIRS += drivers/i2c
  TAG_SUBDIRS += drivers/input
@@@ -452,7 -465,8 +465,8 @@@ $(obj)include/autoconf.mk: $(obj)includ
        set -e ; \
        : Extract the config macros ; \
        $(CPP) $(CFLAGS) -DDO_DEPS_ONLY -dM include/common.h | \
-               sed -n -f tools/scripts/define2mk.sed > $@
+               sed -n -f tools/scripts/define2mk.sed > $@.tmp && \
+       mv $@.tmp $@
  
  sinclude $(obj)include/autoconf.mk.dep
  
@@@ -460,7 -474,7 +474,7 @@@
  else  # !config.mk
  all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
  $(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \
- $(SUBDIRS) $(VERSION_FILE) gdbtools updater env depend \
+ $(SUBDIRS) $(TIMESTAMP_FILE) $(VERSION_FILE) gdbtools updater env depend \
  dep tags ctags etags cscope $(obj)System.map:
        @echo "System not configured - see README" >&2
        @ exit 1
@@@ -1250,14 -1264,11 +1264,11 @@@ CMS700_config:       unconfi
  CPCI2DP_config:       unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci2dp esd
  
- CPCI405_config:               unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci405 esd
- 
+ CPCI405_config                \
  CPCI4052_config               \
  CPCI405DT_config      \
  CPCI405AB_config:     unconfig
        @mkdir -p $(obj)board/esd/cpci405
-       @echo "TEXT_BASE = 0xFFFC0000" > $(obj)board/esd/cpci405/config.tmp
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci405 esd
  
  CPCIISER4_config:     unconfig
@@@ -2175,9 -2186,6 +2186,9 @@@ TASREG_config :         unconfi
  ## MPC83xx Systems
  #########################################################################
  
 +kmeter1_config: unconfig
 +      @$(MKCONFIG) kmeter1 ppc mpc83xx kmeter1 keymile
 +
  MPC8313ERDB_33_config \
  MPC8313ERDB_66_config \
  MPC8313ERDB_NAND_33_config \
@@@ -2455,6 -2463,12 +2466,12 @@@ TQM8560_config:               unconfi
        echo "#define CONFIG_BOARDNAME \"TQM$${CTYPE}\"">>$(obj)include/config.h;
        @$(MKCONFIG) -a TQM85xx ppc mpc85xx tqm85xx tqc
  
+ XPEDITE5200_config:   unconfig
+       @$(MKCONFIG) $(@:_config=) ppc mpc85xx xpedite5200 xes
+ 
+ XPEDITE5370_config:   unconfig
+       @$(MKCONFIG) $(@:_config=) ppc mpc85xx xpedite5370 xes
+ 
  #########################################################################
  ## MPC86xx Systems
  #########################################################################
@@@ -2584,17 -2598,84 +2601,84 @@@ afeb9260_config:     unconfi
  at91cap9adk_config    :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91
  
+ at91sam9260ek_nandflash_config \
+ at91sam9260ek_dataflash_cs0_config \
+ at91sam9260ek_dataflash_cs1_config \
  at91sam9260ek_config  :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ek atmel at91
+       @mkdir -p $(obj)include
+       @if [ "$(findstring _nandflash,$@)" ] ; then \
+               echo "#define CONFIG_SYS_USE_NANDFLASH 1"       >>$(obj)include/config.h ; \
+               $(XECHO) "... with environment variable in NAND FLASH" ; \
+       elif [ "$(findstring dataflash_cs0,$@)" ] ; then \
+               echo "#define CONFIG_SYS_USE_DATAFLASH_CS0 1"   >>$(obj)include/config.h ; \
+               $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
+       else \
+               echo "#define CONFIG_SYS_USE_DATAFLASH_CS1 1"   >>$(obj)include/config.h ; \
+               $(XECHO) "... with environment variable in SPI DATAFLASH CS1" ; \
+       fi;
+       @$(MKCONFIG) -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91
+ 
+ at91sam9xeek_nandflash_config \
+ at91sam9xeek_dataflash_cs0_config \
+ at91sam9xeek_dataflash_cs1_config \
+ at91sam9xeek_config   :       unconfig
+       @mkdir -p $(obj)include
+       @if [ "$(findstring _nandflash,$@)" ] ; then \
+               echo "#define CONFIG_SYS_USE_NANDFLASH 1"       >>$(obj)include/config.h ; \
+               $(XECHO) "... with environment variable in NAND FLASH" ; \
+       elif [ "$(findstring dataflash_cs0,$@)" ] ; then \
+               echo "#define CONFIG_SYS_USE_DATAFLASH_CS0 1"   >>$(obj)include/config.h ; \
+               $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
+       else \
+               echo "#define CONFIG_SYS_USE_DATAFLASH_CS1 1"   >>$(obj)include/config.h ; \
+               $(XECHO) "... with environment variable in SPI DATAFLASH CS1" ; \
+       fi;
+       @$(MKCONFIG) -n at91sam9xeek -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91sam9
  
+ at91sam9261ek_nandflash_config \
+ at91sam9261ek_dataflash_cs0_config \
+ at91sam9261ek_dataflash_cs3_config \
  at91sam9261ek_config  :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9261ek atmel at91
+       @mkdir -p $(obj)include
+       @if [ "$(findstring _nandflash,$@)" ] ; then \
+               echo "#define CONFIG_SYS_USE_NANDFLASH 1"       >>$(obj)include/config.h ; \
+               $(XECHO) "... with environment variable in NAND FLASH" ; \
+       elif [ "$(findstring dataflash_cs3,$@)" ] ; then \
+               echo "#define CONFIG_SYS_USE_DATAFLASH_CS3 1"   >>$(obj)include/config.h ; \
+               $(XECHO) "... with environment variable in SPI DATAFLASH CS3" ; \
+       else \
+               echo "#define CONFIG_SYS_USE_DATAFLASH_CS0 1"   >>$(obj)include/config.h ; \
+               $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
+       fi;
+       @$(MKCONFIG) -a at91sam9261ek arm arm926ejs at91sam9261ek atmel at91
  
+ at91sam9263ek_nandflash_config \
+ at91sam9263ek_dataflash_config \
+ at91sam9263ek_dataflash_cs0_config \
  at91sam9263ek_config  :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9263ek atmel at91
+       @mkdir -p $(obj)include
+       @if [ "$(findstring _nandflash,$@)" ] ; then \
+               echo "#define CONFIG_SYS_USE_NANDFLASH 1"       >>$(obj)include/config.h ; \
+               $(XECHO) "... with environment variable in NAND FLASH" ; \
+       else \
+               echo "#define CONFIG_SYS_USE_DATAFLASH 1"       >>$(obj)include/config.h ; \
+               $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
+       fi;
+       @$(MKCONFIG) -a at91sam9263ek arm arm926ejs at91sam9263ek atmel at91
  
+ at91sam9rlek_nandflash_config \
+ at91sam9rlek_dataflash_config \
+ at91sam9rlek_dataflash_cs0_config \
  at91sam9rlek_config   :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9rlek atmel at91
+       @mkdir -p $(obj)include
+       @if [ "$(findstring _nandflash,$@)" ] ; then \
+               echo "#define CONFIG_SYS_USE_NANDFLASH 1"       >>$(obj)include/config.h ; \
+               $(XECHO) "... with environment variable in NAND FLASH" ; \
+       else \
+               echo "#define CONFIG_SYS_USE_DATAFLASH 1"       >>$(obj)include/config.h ; \
+               $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
+       fi;
+       @$(MKCONFIG) -a at91sam9rlek arm arm926ejs at91sam9rlek atmel at91
  
  ########################################################################
  ## ARM Integrator boards - see doc/README-integrator for more info.
@@@ -3099,11 -3180,6 +3183,6 @@@ suzaku_config: unconfi
        @echo "#define CONFIG_SUZAKU 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) microblaze microblaze suzaku AtmarkTechno
  
- xupv2p_config:        unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_XUPV2P 1" > $(obj)include/config.h
-       @$(MKCONFIG) -a $(@:_config=) microblaze microblaze xupv2p xilinx
- 
  #========================================================================
  # Blackfin
  #========================================================================
@@@ -3154,9 -3230,9 +3233,9 @@@ mimc200_config          :       unconfi
  ## sh2 (Renesas SuperH)
  #########################################################################
  rsk7203_config: unconfig
-       @ >include/config.h
-       @echo "#define CONFIG_RSK7203 1" >> include/config.h
-       @./mkconfig -a $(@:_config=) sh sh2 rsk7203 renesas
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_RSK7203 1" > $(obj)/include/config.h
+       @$(MKCONFIG) -a $(@:_config=) sh sh2 rsk7203 renesas
  
  #########################################################################
  ## sh3 (Renesas SuperH)
@@@ -3179,7 -3255,7 +3258,7 @@@ ms7720se_config: unconfi
  MigoR_config :       unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_MIGO_R 1" > $(obj)include/config.h
-       @./mkconfig -a $(@:_config=) sh sh4 MigoR renesas
+       @$(MKCONFIG) -a $(@:_config=) sh sh4 MigoR renesas
  
  ms7750se_config: unconfig
        @mkdir -p $(obj)include
@@@ -3275,7 -3351,7 +3354,7 @@@ clean
        @rm -f $(obj)include/bmp_logo.h
        @rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map}
        @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl-2k.bin,ipl-4k.bin,ipl.map}
-       @rm -f $(obj)api_examples/demo $(VERSION_FILE)
+       @rm -f $(obj)api_examples/demo $(TIMESTAMP_FILE) $(VERSION_FILE)
        @find $(OBJTREE) -type f \
                \( -name 'core' -o -name '*.bak' -o -name '*~' \
                -o -name '*.o'  -o -name '*.a'  \) -print \