Merge branch 'master' of git://git.denx.de/u-boot-arm

diff --combined MAINTAINERS
index 00411128a703589e6b19f0d13d9e4f4f86147513,6fc2901d3502f9870bee762c06248fcb50986c11..376a0a9e32f8b835d53bd72b76748d64b256370d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -547,6 -547,10 +547,10 @@@ Daniel Gorsulowski <daniel.gorsulowski@
  
        meesc           ARM926EJS (AT91SAM9263 SoC)
  
+ Sedji Gaouaou<sedji.gaouaou@atmel.com>
+       at91sam9g10ek           ARM926EJS (AT91SAM9G10 SoC)     
+       at91sam9m10g45ek        ARM926EJS (AT91SAM9G45 SoC)
+ 
  Marius Gröger <mag@sysgo.de>
  
        impa7           ARM720T (EP7211)
@@@ -583,10 -587,6 +587,10 @@@ Prakash Kumar <prakash@embedx.com
  
        cerf250         xscale
  
 +Sergey Lapin <slapin@ossfans.org>
 +
 +      afeb9260        ARM926EJS (AT91SAM9260 SoC)
 +
  Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  
        imx31_phycore_eet       i.MX31
@@@ -686,6 -686,10 +690,6 @@@ Alex Züpke <azu@sysgo.de
        lart            SA1100
        dnp1110         SA1110
  
 -Sergey Lapin <slapin@ossfans.org>
 -
 -      afeb9260        ARM926EJS (AT91SAM9260 SoC)
 -
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:
@@@ -782,14 -786,14 +786,14 @@@ Michal Simek <monstr@monstr.eu
  #     Board           CPU                                             #
  #########################################################################
  
 -Matthias Fuchs <matthias.fuchs@esd-electronics.com>
 -
 -      TASREG          MCF5249
 -
  Hayden Fraser <Hayden.Fraser@freescale.com>
  
        M5253EVBE       mcf52x2
  
 +Matthias Fuchs <matthias.fuchs@esd-electronics.com>
 +
 +      TASREG          MCF5249
 +
  TsiChung Liew <Tsi-Chung.Liew@freescale.com>
  
        M52277EVB       mcf5227x
@@@ -862,6 -866,10 +866,6 @@@ Yoshihiro Shimoda <shimoda.yoshihiro@re
        MS7720SE        SH7720
        R0P77850011RL   SH7785
  
 -Yusuke Goda <goda.yusuke@renesas.com>
 -
 -      MIGO-R          SH7722
 -
  #########################################################################
  # Blackfin Systems:                                                   #
  #                                                                     #

diff --combined MAKEALL
index 2b42352b5de1b8982ed2e82f03fadefa5217cc17,3c15f9c3c2b1e3fc56ab45db748a36e16c466095..416308043002669b8cf803e776c36e5504245b5e
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -578,24 -578,26 +578,26 @@@ LIST_ARM_CORTEX_A8="            
  ## AT91 Systems
  #########################################################################
  
- LIST_at91="           \
-       afeb9260        \
-       at91cap9adk     \
-       at91rm9200dk    \
-       at91rm9200ek    \
-       at91sam9260ek   \
-       at91sam9261ek   \
-       at91sam9263ek   \
-       at91sam9g20ek   \
-       at91sam9rlek    \
-       cmc_pu2         \
-       csb637          \
-       kb9202          \
-       meesc           \
-       mp2usb          \
-       m501sk          \
-       pm9261          \
-       pm9263          \
+ LIST_at91="                   \
+       afeb9260                \
+       at91cap9adk             \
+       at91rm9200dk            \
+       at91rm9200ek            \
+       at91sam9260ek           \
+       at91sam9261ek           \
+       at91sam9263ek           \
+       at91sam9g10ek   \
+       at91sam9g20ek           \
+       at91sam9m10g45ek        \
+       at91sam9rlek            \
+       cmc_pu2                 \
+       csb637                  \
+       kb9202                  \
+       meesc                   \
+       mp2usb                  \
+       m501sk                  \
+       pm9261                  \
+       pm9263                  \
  "
  
  #########################################################################
@@@ -848,7 -850,6 +850,7 @@@ LIST_sh4="         
        sh7763rdp       \
        sh7785lcr       \
        ap325rxa        \
 +      espt            \
  "
  
  LIST_sh="             \

diff --combined Makefile
index 0d607cad54986377426a5e529045c818bf740e67,3e71a088adeb2231fb57010498a06c2b21aac709..015368c2d8ade1b83165778a8bb0d4a019648f4d
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -2743,12 -2743,22 +2743,22 @@@ at91sam9xeek_config  :       unconfi
  at91sam9261ek_nandflash_config \
  at91sam9261ek_dataflash_cs0_config \
  at91sam9261ek_dataflash_cs3_config \
- at91sam9261ek_config  :       unconfig
-       @mkdir -p $(obj)include
+ at91sam9261ek_config \
+ at91sam9g10ek_nandflash_config \
+ at91sam9g10ek_dataflash_cs0_config \
+ at91sam9g10ek_dataflash_cs3_config \
+ at91sam9g10ek_config  :       unconfig
+       @mkdir -p $(obj)include
+       @if [ "$(findstring 9g10,$@)" ] ; then \
+               echo "#define CONFIG_AT91SAM9G10EK 1"   >>$(obj)include/config.h ; \
+               $(XECHO) "... 9G10 Variant" ; \
+       else \
+               echo "#define CONFIG_AT91SAM9261EK 1"   >>$(obj)include/config.h ; \
+       fi;
        @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 \
+       elif [ "$(findstring dataflash_cs0,$@)" ] ; then \
                echo "#define CONFIG_SYS_USE_DATAFLASH_CS3 1"   >>$(obj)include/config.h ; \
                $(XECHO) "... with environment variable in SPI DATAFLASH CS3" ; \
        else \
@@@ -2800,6 -2810,31 +2810,31 @@@ meesc_config  :       unconfi
  pm9261_config :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs pm9261 ronetix at91
  
+ at91sam9m10g45ek_nandflash_config \
+ at91sam9m10g45ek_dataflash_config \
+ at91sam9m10g45ek_dataflash_cs0_config \
+ at91sam9m10g45ek_config \
+ at91sam9g45ekes_nandflash_config \
+ at91sam9g45ekes_dataflash_config \
+ at91sam9g45ekes_dataflash_cs0_config \
+ at91sam9g45ekes_config        :       unconfig
+       @mkdir -p $(obj)include
+               @if [ "$(findstring 9m10,$@)" ] ; then \
+               echo "#define CONFIG_AT91SAM9M10G45EK 1"        >>$(obj)include/config.h ; \
+               $(XECHO) "... 9M10G45 Variant" ; \
+       else \
+               echo "#define CONFIG_AT91SAM9G45EKES 1" >>$(obj)include/config.h ; \
+       fi;
+ 
+       @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_ATMEL_SPI 1"       >>$(obj)include/config.h ; \
+               $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
+       fi;
+       @$(MKCONFIG) -a at91sam9m10g45ek arm arm926ejs at91sam9m10g45ek atmel at91
+ 
  pm9263_config :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs pm9263 ronetix at91
  
@@@ -3529,14 -3564,18 +3564,14 @@@ sh7763rdp_config  :   unconfi
  xtract_sh7785lcr = $(subst _32bit,,$(subst _config,,$1))
  sh7785lcr_32bit_config \
  sh7785lcr_config  :   unconfig
 -      @ >include/config.h
 -      @echo "#define CONFIG_SH7785LCR 1" >> include/config.h
 +      @mkdir -p $(obj)include
 +      @mkdir -p $(obj)board/renesas/sh7785lcr
 +      @echo "#define CONFIG_SH7785LCR 1" > $(obj)include/config.h
        @if [ "$(findstring 32bit, $@)" ] ; then \
                echo "#define CONFIG_SH_32BIT 1" >> $(obj)include/config.h ; \
 -              cp $(obj)board/renesas/sh7785lcr/u-boot_32bit \
 -                      $(obj)board/renesas/sh7785lcr/u-boot.lds ; \
                echo "TEXT_BASE = 0x8ff80000" > \
                        $(obj)board/renesas/sh7785lcr/config.tmp ; \
                  $(XECHO) " ... enable 32-Bit Address Extended Mode" ; \
 -      else \
 -              cp $(obj)board/renesas/sh7785lcr/u-boot_29bit \
 -                      $(obj)board/renesas/sh7785lcr/u-boot.lds ; \
        fi
        @$(MKCONFIG) -a $(call xtract_sh7785lcr,$@) sh sh4 sh7785lcr renesas
  
@@@ -3545,11 -3584,6 +3580,11 @@@ ap325rxa_config  :   unconfi
        @echo "#define CONFIG_AP325RXA 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) sh sh4 ap325rxa renesas
  
 +espt_config  :   unconfig
 +      @mkdir -p $(obj)include
 +      @echo "#define CONFIG_ESPT 1" > $(obj)include/config.h
 +      @$(MKCONFIG) -a $(@:_config=) sh sh4 espt
 +
  #========================================================================
  # SPARC
  #========================================================================

diff --combined drivers/mtd/nand/Makefile
index c1325b905da63087064db9dbf673daecf635dc50,d4d39485329936600ebbe8419314a4bd64cc8948..a5680e80ee55256378ad5410ade4ddc83ca9a49a
--- 1/drivers/mtd/nand/Makefile
--- 2/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@@ -40,12 -40,12 +40,13 @@@ COBJS-$(CONFIG_DRIVER_NAND_BFIN) += bfi
  COBJS-$(CONFIG_NAND_DAVINCI) += davinci_nand.o
  COBJS-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_nand.o
  COBJS-$(CONFIG_NAND_FSL_UPM) += fsl_upm.o
+ COBJS-$(CONFIG_NAND_KIRKWOOD) += kirkwood_nand.o
  COBJS-$(CONFIG_NAND_MPC5121_NFC) += mpc5121_nfc.o
  COBJS-$(CONFIG_NAND_NOMADIK) += nomadik.o
 -COBJS-$(CONFIG_NAND_S3C2410) += s3c2410_nand.c
 +COBJS-$(CONFIG_NAND_S3C2410) += s3c2410_nand.o
  COBJS-$(CONFIG_NAND_S3C64XX) += s3c64xx.o
  COBJS-$(CONFIG_NAND_OMAP_GPMC) += omap_gpmc.o
 +COBJS-$(CONFIG_NAND_PLAT) += nand_plat.o
  endif
  
  COBJS := $(COBJS-y)