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

diff --combined MAINTAINERS
index 88cf1e9,e1ebca9..38feac8
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -132,7 -132,6 +132,7 @@@ Jon Diekema <jon.diekema@smiths-aerospa
  
  Dirk Eibach <eibach@gdsys.de>
  
 +      gdppc440etx     PPC440EP/GR
        neo             PPC405EP
  
  Dave Ellis <DGE@sixnetio.com>
@@@ -487,6 -486,10 +487,10 @@@ Rowel Atienza <rowel@diwalabs.com
  
        armadillo       ARM720T
  
+ Dirk Behme <dirk.behme@gmail.com>
+ 
+       omap3_beagle    ARM CORTEX-A8 (OMAP3530 SoC)
+ 
  Rishi Bhattacharya <rishi@ti.com>
  
        omap5912osk     ARM926EJS
@@@ -527,6 -530,10 +531,10 @@@ Sascha Hauer <s.hauer@pengutronix.de
        imx31_litekit   i.MX31
        imx31_phycore   i.MX31
  
+ Grazvydas Ignotas <notasas@gmail.com>
+ 
+       omap3_pandora   ARM CORTEX-A8 (OMAP3xx SoC)
+ 
  Gary Jennejohn <gj@denx.de>
  
        smdk2400        ARM920T
@@@ -554,6 -561,10 +562,10 @@@ Guennadi Liakhovetski <g.liakhovetski@g
        mx31ads         i.MX31
        SMDK6400        S3C6400
  
+ Nishanth Menon <nm@ti.com>
+ 
+       omap3_zoom1     ARM CORTEX-A8 (OMAP3xx SoC)
+ 
  David Müller <d.mueller@elsoft.ch>
  
        smdk2410        ARM920T
@@@ -577,6 -588,10 +589,10 @@@ Dave Peverley <dpeverley@mpc-data.co.uk
  
        omap730p2       ARM926EJS
  
+ Manikandan Pillai <mani.pillai@ti.com>
+ 
+       omap3_evm       ARM CORTEX-A8 (OMAP3xx SoC)
+ 
  Stelian Pop <stelian.pop@leadtechdesign.com>
  
        at91cap9adk     ARM926EJS (AT91CAP9 SoC)
@@@ -591,6 -606,15 +607,15 @@@ Stefan Roese <sr@denx.de
        pdnb3           xscale
        scpu            xscale
  
+ Alessandro Rubini <rubini@unipv.it>
+ Nomadik Linux Team <STN_WMM_nomadik_linux@list.st.com>
+ 
+       nmdk8815        ARM926EJS (Nomadik 8815 Soc)
+ 
+ Steve Sakoman <sakoman@gmail.com>
+ 
+       omap3_overo     ARM CORTEX-A8 (OMAP3xx SoC)
+ 
  Robert Schwebel <r.schwebel@pengutronix.de>
  
        csb226          xscale
@@@ -669,10 -693,6 +694,10 @@@ Thomas Lange <thomas@corelatus.se
  Vlad Lungu <vlad.lungu@windriver.com>
        qemu_mips       MIPS32
  
 +Stefan Roese <sr@denx.de>
 +
 +      vct_xxx         MIPS32 4Kc
 +
  #########################################################################
  # Nios-32 Systems:                                                    #
  #                                                                     #

diff --combined MAKEALL
index e963f61,1c3ff81..cf05133
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -197,7 -197,6 +197,7 @@@ LIST_4xx="         
        EXBITGEN        \
        fx12mm          \
        G2000           \
 +      gdppc440etx     \
        glacier         \
        haleakala       \
        haleakala_nand  \
@@@ -502,6 -501,7 +502,7 @@@ LIST_ARM9="                        
        mx1ads                  \
        mx1fs2                  \
        netstar                 \
+       nmdk8815                \
        omap1510inn             \
        omap1610h2              \
        omap1610inn             \
@@@ -545,6 -545,17 +546,17 @@@ LIST_ARM11="             
  "
  
  #########################################################################
+ ## ARM Cortex-A8 Systems
+ #########################################################################
+ LIST_ARM_CORTEX_A8="          \
+       omap3_beagle            \
+       omap3_overo             \
+       omap3_evm               \
+       omap3_pandora           \
+       omap3_zoom1             \
+ "
+ 
+ #########################################################################
  ## AT91 Systems
  #########################################################################
  
@@@ -598,15 -609,16 +610,16 @@@ LIST_ixp="              
  ## ARM groups
  #########################################################################
  
- LIST_arm="            \
-       ${LIST_SA}      \
-       ${LIST_ARM7}    \
-       ${LIST_ARM9}    \
-       ${LIST_ARM10}   \
-       ${LIST_ARM11}   \
-       ${LIST_at91}    \
-       ${LIST_pxa}     \
-       ${LIST_ixp}     \
+ LIST_arm="                    \
+       ${LIST_SA}              \
+       ${LIST_ARM7}            \
+       ${LIST_ARM9}            \
+       ${LIST_ARM10}           \
+       ${LIST_ARM11}           \
+       ${LIST_ARM_CORTEX_A8}   \
+       ${LIST_at91}            \
+       ${LIST_pxa}             \
+       ${LIST_ixp}             \
  "
  
  #########################################################################
@@@ -616,18 -628,6 +629,18 @@@
  LIST_mips4kc="                \
        incaip          \
        qemu_mips       \
 +      vct_platinum    \
 +      vct_platinum_small      \
 +      vct_platinum_onenand    \
 +      vct_platinum_onenand_small      \
 +      vct_platinumavc \
 +      vct_platinumavc_small   \
 +      vct_platinumavc_onenand \
 +      vct_platinumavc_onenand_small   \
 +      vct_premium     \
 +      vct_premium_small       \
 +      vct_premium_onenand     \
 +      vct_premium_onenand_small       \
  "
  
  LIST_mips5kc="                \
@@@ -834,7 -834,7 +847,7 @@@ build_target() 
  for arg in $@
  do
        case "$arg" in
-       arm|SA|ARM7|ARM9|ARM10|ARM11|at91|ixp|pxa \
+       arm|SA|ARM7|ARM9|ARM10|ARM11|ARM_CORTEX_A8|at91|ixp|pxa \
        |avr32 \
        |blackfin \
        |coldfire \

diff --combined Makefile
index 9647bd2,9e820c4..787c5f2
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -317,7 -317,7 +317,7 @@@ $(obj)u-boot.bin:  $(obj)u-boo
                $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@
  
  $(obj)u-boot.ldr:     $(obj)u-boot
 -              $(LDR) -T $(CONFIG_BFIN_CPU) -f -c $@ $< $(LDR_FLAGS)
 +              $(LDR) -T $(CONFIG_BFIN_CPU) -c $@ $< $(LDR_FLAGS)
  
  $(obj)u-boot.ldr.hex: $(obj)u-boot.ldr
                $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@ -I binary
@@@ -1325,9 -1325,6 +1325,9 @@@ fx12mm_config: unconfi
  G2000_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx g2000
  
 +gdppc440etx_config:   unconfig
 +      @$(MKCONFIG) $(@:_config=) ppc ppc4xx gdppc440etx gdsys
 +
  hcu4_config:  unconfig
        @mkdir -p $(obj)board/netstal/common
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu4 netstal
@@@ -2716,7 -2713,7 +2716,7 @@@ ap720t_config           
  ap920t_config         \
  ap926ejs_config               \
  ap946es_config: unconfig
-       @board/integratorap/split_by_variant.sh $@
+       @board/armltd/integratorap/split_by_variant.sh $@
  
  integratorcp_config   \
  cp_config             \
@@@ -2728,7 -2725,7 +2728,7 @@@ cp966_config            
  cp922_config          \
  cp922_XA10_config     \
  cp1026_config: unconfig
-       @board/integratorcp/split_by_variant.sh $@
+       @board/armltd/integratorcp/split_by_variant.sh $@
  
  davinci_dvevm_config :        unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs dvevm davinci davinci
@@@ -2755,6 -2752,18 +2755,18 @@@ mx1fs2_config :       unconfi
  netstar_config:               unconfig
        @$(MKCONFIG) $(@:_config=) arm arm925t netstar
  
+ nmdk8815_config \
+ nmdk8815_onenand_config:      unconfig
+       @mkdir -p $(obj)include
+       @ > $(obj)include/config.h
+       @if [ "$(findstring _onenand, $@)" ] ; then \
+               echo "#define CONFIG_BOOT_ONENAND" >> $(obj)include/config.h; \
+               $(XECHO) "... configured for OneNand Flash"; \
+       else \
+               $(XECHO) "... configured for Nand Flash"; \
+       fi
+       @$(MKCONFIG) -a nmdk8815 arm arm926ejs nmdk8815 st nomadik
+ 
  omap1510inn_config :  unconfig
        @$(MKCONFIG) $(@:_config=) arm arm925t omap1510inn
  
@@@ -2806,13 -2815,22 +2818,22 @@@ scb9328_config       :       unconfi
        @$(MKCONFIG) $(@:_config=) arm arm920t scb9328 NULL imx
  
  smdk2400_config       :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm920t smdk2400 NULL s3c24x0
+       @$(MKCONFIG) $(@:_config=) arm arm920t smdk2400 samsung s3c24x0
  
  smdk2410_config       :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm920t smdk2410 NULL s3c24x0
+       @$(MKCONFIG) $(@:_config=) arm arm920t smdk2410 samsung s3c24x0
  
- SX1_config :          unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm925t sx1
+ SX1_stdout_serial_config \
+ SX1_config:           unconfig
+       @mkdir -p $(obj)include
+       @if [ "$(findstring _stdout_serial_, $@)" ] ; then \
+               echo "#undef CONFIG_STDOUT_USBTTY" >> $(obj)include/config.h ; \
+               $(XECHO) "... configured for stdout serial"; \
+       else \
+               echo "#define CONFIG_STDOUT_USBTTY" >> $(obj)include/config.h ; \
+               $(XECHO) "... configured for stdout usbtty"; \
+       fi;
+       @$(MKCONFIG) SX1 arm arm925t sx1
  
  # TRAB default configuration: 8 MB Flash, 32 MB RAM
  xtract_trab = $(subst _bigram,,$(subst _bigflash,,$(subst _old,,$(subst _config,,$1))))
@@@ -2858,7 -2876,7 +2879,7 @@@ cm41xx_config   :       unconfi
  versatile_config      \
  versatileab_config    \
  versatilepb_config :  unconfig
-       @board/versatile/split_by_variant.sh $@
+       @board/armltd/versatile/split_by_variant.sh $@
  
  voiceblue_config:     unconfig
        @$(MKCONFIG) $(@:_config=) arm arm925t voiceblue
@@@ -2896,6 -2914,25 +2917,25 @@@ SMN42_config  :       unconfi
        @$(MKCONFIG) $(@:_config=) arm arm720t SMN42 siemens lpc2292
  
  #########################################################################
+ ## ARM CORTEX Systems
+ #########################################################################
+ 
+ omap3_beagle_config : unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 beagle omap3 omap3
+ 
+ omap3_overo_config :  unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 overo omap3 omap3
+ 
+ omap3_evm_config :    unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 evm omap3 omap3
+ 
+ omap3_pandora_config :        unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 pandora omap3 omap3
+ 
+ omap3_zoom1_config :  unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 omap3 omap3
+ 
+ #########################################################################
  ## XScale Systems
  #########################################################################
  
@@@ -3060,41 -3097,6 +3100,41 @@@ incaip_config: unconfi
  tb0229_config: unconfig
        @$(MKCONFIG) $(@:_config=) mips mips tb0229
  
 +vct_premium_config            \
 +vct_premium_small_config      \
 +vct_premium_onenand_config    \
 +vct_premium_onenand_small_config \
 +vct_platinum_config           \
 +vct_platinum_small_config     \
 +vct_platinum_onenand_config   \
 +vct_platinum_onenand_small_config \
 +vct_platinumavc_config                \
 +vct_platinumavc_small_config  \
 +vct_platinumavc_onenand_config        \
 +vct_platinumavc_onenand_small_config: unconfig
 +      @mkdir -p $(obj)include
 +      @if [ "$(findstring _premium,$@)" ] ; then \
 +              echo "#define CONFIG_VCT_PREMIUM" > $(obj)include/config.h ; \
 +              $(XECHO) "... on Premium board variant" ; \
 +      fi
 +      @if [ "$(findstring _platinum_,$@)" ] ; then \
 +              echo "#define CONFIG_VCT_PLATINUM" > $(obj)include/config.h ; \
 +              $(XECHO) "... on Platinum board variant" ; \
 +      fi
 +      @if [ "$(findstring _platinumavc,$@)" ] ; then \
 +              echo "#define CONFIG_VCT_PLATINUMAVC" > $(obj)include/config.h ; \
 +              $(XECHO) "... on PlatinumAVC board variant" ; \
 +      fi
 +      @if [ "$(findstring _onenand,$@)" ] ; then \
 +              echo "#define CONFIG_VCT_ONENAND" >> $(obj)include/config.h ; \
 +              $(XECHO) "... on OneNAND board variant" ; \
 +      fi
 +      @if [ "$(findstring _small,$@)" ] ; then \
 +              echo "#define CONFIG_VCT_SMALL_IMAGE" >> $(obj)include/config.h ; \
 +              $(XECHO) "... stripped down image variant" ; \
 +      fi
 +      @$(MKCONFIG) -a vct mips mips vct micronas
 +
  #########################################################################
  ## MIPS32 AU1X00
  #########################################################################

diff --combined drivers/i2c/Makefile
index 08cb91d,12e9e05..9c74657
--- 1/drivers/i2c/Makefile
--- 2/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@@ -25,11 -25,11 +25,12 @@@ include $(TOPDIR)/config.m
  
  LIB   := $(obj)libi2c.a
  
 +COBJS-$(CONFIG_BFIN_TWI_I2C) += bfin-twi_i2c.o
  COBJS-$(CONFIG_FSL_I2C) += fsl_i2c.o
  COBJS-$(CONFIG_I2C_MXC) += mxc_i2c.o
  COBJS-$(CONFIG_DRIVER_OMAP1510_I2C) += omap1510_i2c.o
  COBJS-$(CONFIG_DRIVER_OMAP24XX_I2C) += omap24xx_i2c.o
+ COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += omap24xx_i2c.o
  COBJS-$(CONFIG_SOFT_I2C) += soft_i2c.o
  COBJS-$(CONFIG_TSI108_I2C) += tsi108_i2c.o