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

* 'master' of git://git.denx.de/u-boot-arm:
  M28: Cleanup memsize.o OOT build
  i.MX28: Move SPL to arch/arm/cpu/arm926ejs/mx28
  M28: Fix typo
  M28: Document that units has to be set to sectors on SD bootcard
  i.mx: i.mx6q: add the initial support for i.mx6q ARM2 board
  i.mx: mxc_gpio: add the i.mx6q support
  i.mx: add the initial support for freescale i.MX6Q processor
  i.mx: introduce the armv7/imx-common folder
  S5PC2XX: Rename S5pc2XX to exynos
  tegra2: Don't use board pointer before it is set up
  tegra2: Remove unneeded 'dynamic ram size' message
  tegra2: Remove unused low-level Tegra2 UART code
  tegra2: Remove unneeded config option
  tegra2: Remove unneeded boot code
  tegra2: Enable instruction cache
  arm: Move CP15 init out of cpu_init_crit()
  tegra2: Simplify tegra_start() boot path
  tegra2: Add arch_cpu_init() to fire up Cortex-A9
  tegra2: Use new GPIO APIs in gpio_config_uart()
  tegra2: Add support for Ventana
  tegra2: Modify MMC driver to handle power and cd GPIOs
  tegra2: Move board_mmc_init into board files

diff --combined MAINTAINERS
index 0969a1b9ee5ee578e214a067a0ded5d730a9918e,a8ec96942fb0060090fd868ed9ca12322e63f45f..a56ca10f3fcb993b14fd8c25dd0254595aa7c37c
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -321,10 -321,6 +321,10 @@@ Reinhard Meyer <reinhard.meyer@emk-elek
        TOP5200         MPC5200
        TOP9000         ARM926EJS (AT91SAM9xxx SoC)
  
 +Kyle Moffett <Kyle.D.Moffett@boeing.com>
 +
 +      HWW1U1A         P2020
 +
  Tolunay Orkun <torkun@nextio.com>
  
        csb272          PPC405GP
@@@ -578,6 -574,7 +578,7 @@@ Jason Liu <r64343@freescale.com
  
        mx53evk         i.MX53
        mx53loco        i.MX53
+       mx6qarm2        i.MX6Q
  
  Enric Balletbo i Serra <eballetbo@iseebcn.com>
  
@@@ -697,12 -694,12 +698,12 @@@ Minkyu Kang <mk7.kang@samsung.com
  
        SMDKC100                ARM ARMV7 (S5PC100 SoC)
        s5p_goni                ARM ARMV7 (S5PC110 SoC)
-       s5pc210_universal       ARM ARMV7 (S5PC210 SoC)
+       s5pc210_universal       ARM ARMV7 (EXYNOS4210 SoC)
  
  Chander Kashyap <k.chander@samsung.com>
  
-       origen                  ARM ARMV7 (S5PC210 SoC)
-       SMDKV310                ARM ARMV7 (S5PC210 SoC)
+       origen                  ARM ARMV7 (EXYNOS4210 SoC)
+       SMDKV310                ARM ARMV7 (EXYNOS4210 SoC)
  
  Torsten Koschorrek <koschorrek@synertronixx.de>
        scb9328         ARM920T (i.MXL)
@@@ -880,6 -877,11 +881,11 @@@ Tom Warren <twarren@nvidia.com
        harmony         Tegra2 (ARM7 & A9 Dual Core)
        seaboard        Tegra2 (ARM7 & A9 Dual Core)
  
+ Tom Warren <twarren@nvidia.com>
+ Stephen Warren <swarren@nvidia.com>
+ 
+       ventana         Tegra2 (ARM7 & A9 Dual Core)
+ 
  Thomas Weber <weber@corscience.de>
  
        devkit8000      ARM ARMV7 (OMAP3530 SoC)

diff --combined boards.cfg
index d847850068c38373758e8a2b8a654d9bdf0c7061,ea9227bc1dd85dbcf0e421e7ae3a68127a00279c..5b04dca1795440e477a981360f6069452f7c07f2
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -180,6 -180,7 +180,7 @@@ mx53evk                      ar
  mx53loco                     arm         armv7       mx53loco            freescale      mx5           mx53loco:IMX_CONFIG=board/freescale/mx53loco/imximage.cfg
  mx53smd                      arm         armv7       mx53smd             freescale      mx5           mx53smd:IMX_CONFIG=board/freescale/mx53smd/imximage.cfg
  vision2                      arm         armv7       vision2             ttcontrol      mx5           vision2:IMX_CONFIG=board/ttcontrol/vision2/imximage_hynix.cfg
+ mx6qarm2                     arm         armv7       mx6qarm2            freescale      mx6           mx6qarm2:IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg
  cm_t35                       arm         armv7       cm_t35              -              omap3
  omap3_overo                  arm         armv7       overo               -              omap3
  omap3_pandora                arm         armv7       pandora             -              omap3
@@@ -202,11 -203,12 +203,12 @@@ omap4_sdp4430                ar
  omap5_evm                    arm         armv7       omap5_evm           ti           omap5
  s5p_goni                     arm         armv7       goni                samsung        s5pc1xx
  smdkc100                     arm         armv7       smdkc100            samsung        s5pc1xx
- origen                             arm         armv7       origen              samsung        s5pc2xx
- s5pc210_universal            arm         armv7       universal_c210      samsung        s5pc2xx
- smdkv310                   arm         armv7       smdkv310            samsung        s5pc2xx
+ origen                             arm         armv7       origen              samsung        exynos
+ s5pc210_universal            arm         armv7       universal_c210      samsung        exynos
+ smdkv310                   arm         armv7       smdkv310            samsung        exynos
  harmony                      arm         armv7       harmony             nvidia         tegra2
  seaboard                     arm         armv7       seaboard            nvidia         tegra2
+ ventana                      arm         armv7       ventana             nvidia         tegra2
  u8500_href                   arm         armv7       u8500               st-ericsson    u8500
  actux1_4_16                  arm         ixp         actux1              -              -           actux1:FLASH2X2
  actux1_8_16                  arm         ixp         actux1              -              -           actux1:FLASH1X8
@@@ -599,7 -601,6 +601,7 @@@ sbc8560                      powerp
  sbc8560_33                   powerpc     mpc85xx     sbc8560             -              -           sbc8560
  sbc8560_66                   powerpc     mpc85xx     sbc8560             -              -           sbc8560
  socrates                     powerpc     mpc85xx     socrates
 +HWW1U1A                      powerpc     mpc85xx     hww1u1a             exmeritus
  MPC8536DS                    powerpc     mpc85xx     mpc8536ds           freescale      -           MPC8536DS
  MPC8536DS_36BIT              powerpc     mpc85xx     mpc8536ds           freescale      -           MPC8536DS:36BIT
  MPC8536DS_NAND               powerpc     mpc85xx     mpc8536ds           freescale      -           MPC8536DS:NAND