Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

diff --combined MAINTAINERS
index 9abff0a982651786e0f04730eff68e1c4a14351b,001b42d6fea2a49e867a7f6e5bbdaa6b10fbe9ea..3e70b037bf919973386bfc82cc43e93d07f8b303
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -651,9 -651,6 +651,9 @@@ Wolfgang Denk <wd@denx.de
        imx27lite       i.MX27
        qong            i.MX31
  
 +Mike Dunn <mikedunn@newsguy.com>
 +      palmtreo680     pxa270
 +
  Kristoffer Ericson <kristoffer.ericson@gmail.com>
  
        jornada SA1110
@@@ -665,9 -662,9 +665,9 @@@ Fabio Estevam <fabio.estevam@freescale.
        mx31pdk         i.MX31
        mx53ard         i.MX53
        mx53smd         i.MX53
-       mx6qsabresd     i.MX6Q
+       mx6sabresd      i.MX6Q/DL
        mx6qsabreauto   i.MX6Q
-       wandboard       i.MX6DL/S
+       wandboard       i.MX6DL/S/Q
        mx6slevk        i.MX6SL
  
  Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
@@@ -853,10 -850,6 +853,10 @@@ Sricharan R <r.sricharan@ti.com
        omap4_sdp4430   ARM ARMV7 (OMAP4xx SoC)
        omap5_evm       ARM ARMV7 (OMAP5xx Soc)
  
 +Suriyan Ramasami <suriyan.r@gmail.com>
 +
 +      goflexhome      ARM926EJS (Kirkwood SoC)
 +
  Thierry Reding <thierry.reding@avionic-design.de>
  
        plutux          Tegra20 (ARM7 & A9 Dual Core)
@@@ -929,7 -922,6 +929,7 @@@ Matt Sealey <matt@genesi-usa.com
  
  Bo Shen <voice.shen@atmel.com>
        at91sam9x5ek            ARM926EJS (AT91SAM9G15,G25,G35,X25,X35 SoC)
 +      sama5d3xek              ARMV7 (SAMA5D31, D33, D34, D35 SoC)
  
  Rajeshwari Shinde <rajeshwari.s@samsung.com>
  
@@@ -976,14 -968,9 +976,14 @@@ Hugo Villeneuve <hugo.villeneuve@lyrtec
  
        SFFSDR          ARM926EJS
  
 +Lokesh Vutla <lokeshvutla@ti.com>
 +
 +      dra7xx_evm      ARM ARMV7 (DRA7xx Soc)
 +
  Matt Waddel <matt.waddel@linaro.org>
  
 -      ca9x4_ct_vxp    ARM ARMV7 (Quad Core)
 +      vexpress_ca9x4  ARM ARMV7 (Quad Core)
 +      vexpress_ca5x2  ARM ARMV7 (Dual Core)
  
  Otavio Salvador <otavio@ossystems.com.br>
  
@@@ -1036,8 -1023,9 +1036,8 @@@ Matthias Weisser <weisserm@arcor.de
        jadecpu         ARM926EJS (MB86R01 SoC)
        zmx25           ARM926EJS (imx25 SoC)
  
 -Richard Woodruff <r-woodruff2@ti.com>
 -
 -      omap2420h4      ARM1136EJS
 +Josh Wu <josh.wu@atmel.com>
 +      at91sam9n12ek   ARM926EJS (AT91SAM9N12 SoC)
  
  Ilya Yanok <yanok@emcraft.com>
  
@@@ -1077,10 -1065,6 +1077,10 @@@ Alison Wang <b18965@freescale.com
  
        vf610twr        VF610
  
 +Sergey Yanovich <ynvich@gmail.com>
 +
 +      lp8x4x          xscale/pxa
 +
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:
@@@ -1101,19 -1085,9 +1101,19 @@@
  #     Board           CPU                                             #
  #########################################################################
  
 -Graeme Russ <graeme.russ@gmail.com>
 +Simon Glass <sjg@chromium.org>
 +
 +      chromebook-x86  Coreboot runs first, then U-Boot
 +                      Supports Intel Sandy Bridge / Ivy Bridge so far
  
 -      eNET            AMD SC520
 +                      Chromebooks for x86, including:
 +                              Samsung Series 5 Chromebook
 +                              Acer AC700 Chromebook
 +                              Acer C7 Chromebook
 +                              Samsung Chromebook 550
 +                              HP Pavillion Chromebook
 +                              Acer C710 Chromebook
 +                              Chromebook Pixel
  
  #########################################################################
  # MIPS Systems:                                                               #
@@@ -1378,17 -1352,6 +1378,17 @@@ Stefan Kristiansson <stefan.kristiansso
  
        openrisc-generic        OpenRISC
  
 +#########################################################################
 +# Sandbox:                                                            #
 +#                                                                     #
 +# Maintainer Name, Email Address                                      #
 +#     Board           CPU                                             #
 +#########################################################################
 +
 +Simon Glass <sjg@chromium.org>
 +
 +      sandbox         sandbox
 +
  #########################################################################
  # End of MAINTAINERS list                                             #
  #########################################################################

diff --combined boards.cfg
index 815263e9b37e2313da7eaf39c357502fa2a3c7bd,db56488ddc1ba3513536138b5805500f1658294a..1458289abf9cb03fa8c06933358ce5deb0d9ba78
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -52,6 -52,7 +52,6 @@@ flea3                        ar
  mx35pdk                      arm         arm1136     -                   freescale      mx35
  woodburn                     arm         arm1136     -                   -              mx35
  woodburn_sd                  arm         arm1136     woodburn            -              mx35        woodburn_sd:IMX_CONFIG=board/woodburn/imximage.cfg
 -omap2420h4                   arm         arm1136     -                   ti             omap24xx
  tnetv107x_evm                arm         arm1176     tnetv107xevm        ti             tnetv107x
  rpi_b                        arm         arm1176     rpi_b               raspberrypi    bcm2835
  integratorap_cm720t          arm         arm720t     integrator          armltd         -           integratorap:CM720T
@@@ -93,7 -94,6 +93,7 @@@ at91sam9g10ek_dataflash_cs3  ar
  at91sam9g10ek_nandflash      arm         arm926ejs   at91sam9261ek       atmel          at91        at91sam9261ek:AT91SAM9G10,SYS_USE_NANDFLASH
  at91sam9g20ek_dataflash_cs0  arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS0
  at91sam9g20ek_dataflash_cs1  arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS1
 +at91sam9g20ek_mmc            arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_MMC
  at91sam9g20ek_nandflash      arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_NANDFLASH
  at91sam9g20ek_2mmc_nandflash arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH
  at91sam9m10g45ek_nandflash   arm         arm926ejs   at91sam9m10g45ek    atmel          at91        at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_NANDFLASH
@@@ -106,9 -106,6 +106,9 @@@ at91sam9x5ek_mmc             ar
  at91sam9xeek_dataflash_cs0   arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_DATAFLASH_CS0
  at91sam9xeek_dataflash_cs1   arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_DATAFLASH_CS1
  at91sam9xeek_nandflash       arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_NANDFLASH
 +at91sam9n12ek_nandflash      arm         arm926ejs   at91sam9n12ek       atmel          at91        at91sam9n12ek:AT91SAM9N12,SYS_USE_NANDFLASH
 +at91sam9n12ek_spiflash       arm         arm926ejs   at91sam9n12ek       atmel          at91        at91sam9n12ek:AT91SAM9N12,SYS_USE_SPIFLASH
 +at91sam9n12ek_mmc            arm         arm926ejs   at91sam9n12ek       atmel          at91        at91sam9n12ek:AT91SAM9N12,SYS_USE_MMC
  snapper9260                  arm         arm926ejs   -                   bluewater      at91        snapper9260:AT91SAM9260
  snapper9g20                  arm         arm926ejs   snapper9260         bluewater      at91        snapper9260:AT91SAM9G20
  vl_ma2sc                     arm         arm926ejs   vl_ma2sc            BuS            at91
@@@ -188,7 -185,6 +188,7 @@@ rd6281a                      ar
  sheevaplug                   arm         arm926ejs   -                   Marvell        kirkwood
  ib62x0                       arm         arm926ejs   ib62x0              raidsonic      kirkwood
  dockstar                     arm         arm926ejs   -                   Seagate        kirkwood
 +goflexhome                   arm         arm926ejs   -                   Seagate        kirkwood
  tk71                         arm         arm926ejs   tk71                karo           kirkwood
  devkit3250                   arm         arm926ejs   devkit3250          timll          lpc32xx
  jadecpu                      arm         arm926ejs   jadecpu             syteco         mb86r0x
@@@ -238,9 -234,7 +238,9 @@@ versatilepb                  ar
  versatileqemu                arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB
  integratorap_cm946es         arm         arm946es    integrator          armltd         -               integratorap:CM946ES
  integratorcp_cm946es         arm         arm946es    integrator          armltd         -               integratorcp:CM946ES
 -ca9x4_ct_vxp                 arm         armv7       vexpress            armltd
 +vexpress_ca15_tc2            arm         armv7       vexpress            armltd
 +vexpress_ca5x2               arm         armv7       vexpress            armltd
 +vexpress_ca9x4               arm         armv7       vexpress            armltd
  am335x_evm                   arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1
  am335x_evm_spiboot           arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,SPI_BOOT
  am335x_evm_uart1             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL2,CONS_INDEX=2
@@@ -251,9 -245,6 +251,9 @@@ am335x_evm_uart5             ar
  am335x_evm_usbspl            arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,SPL_USBETH_SUPPORT
  ti814x_evm                   arm         armv7       ti814x              ti             am33xx
  pcm051                       arm         armv7       pcm051              phytec         am33xx      pcm051
 +sama5d3xek_mmc               arm         armv7       sama5d3xek          atmel          at91        sama5d3xek:SAMA5D3,SYS_USE_MMC
 +sama5d3xek_nandflash         arm         armv7       sama5d3xek          atmel          at91        sama5d3xek:SAMA5D3,SYS_USE_NANDFLASH
 +sama5d3xek_spiflash          arm         armv7       sama5d3xek          atmel          at91        sama5d3xek:SAMA5D3,SYS_USE_SERIALFLASH
  highbank                     arm         armv7       highbank            -              highbank
  m53evk                       arm         armv7       m53evk              denx         mx5             m53evk:IMX_CONFIG=board/denx/m53evk/imximage.cfg
  mx51_efikamx                 arm         armv7       mx51_efikamx        genesi         mx5           mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_mx.cfg
@@@ -267,9 -258,10 +267,10 @@@ ima3-mx53                    ar
  vision2                      arm         armv7       vision2             ttcontrol      mx5           vision2:IMX_CONFIG=board/ttcontrol/vision2/imximage_hynix.cfg
  cgtqmx6qeval                           arm             armv7           cgtqmx6eval             congatec               mx6             cgtqmx6eval:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q
  mx6qarm2                     arm         armv7       mx6qarm2            freescale      mx6           mx6qarm2:IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg
- mx6qsabreauto                arm         armv7       mx6qsabreauto       freescale      mx6           mx6qsabreauto:IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg
+ mx6qsabreauto                arm         armv7       mx6qsabreauto       freescale      mx6           mx6qsabreauto:IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q
  mx6qsabrelite                arm         armv7       mx6qsabrelite       freescale      mx6           mx6qsabrelite:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
- mx6qsabresd                  arm         armv7       mx6qsabresd         freescale      mx6           mx6qsabresd:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
+ mx6dlsabresd                 arm         armv7       mx6sabresd          freescale      mx6           mx6sabresd:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL
+ mx6qsabresd                  arm         armv7       mx6sabresd          freescale      mx6           mx6sabresd:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q
  mx6slevk                     arm         armv7       mx6slevk            freescale      mx6           mx6slevk:IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL
  titanium                     arm         armv7       titanium            freescale      mx6           titanium:IMX_CONFIG=board/freescale/titanium/imximage.cfg
  vf610twr                     arm         armv7       vf610twr            freescale      vf610         vf610twr:IMX_CONFIG=board/freescale/vf610twr/imximage.cfg
@@@ -281,6 -273,7 +282,7 @@@ nitrogen6q2g                 ar
  nitrogen6s                   arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512
  nitrogen6s1g                 arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024
  wandboard_dl               arm         armv7       wandboard           -              mx6 wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024
+ wandboard_quad                     arm         armv7       wandboard           -              mx6 wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048
  wandboard_solo                     arm         armv7       wandboard           -              mx6 wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512
  omap3_overo                  arm         armv7       overo               -              omap3
  omap3_pandora                arm         armv7       pandora             -              omap3
@@@ -326,7 -319,7 +328,7 @@@ seaboard                     ar
  ventana                      arm         armv7:arm720t ventana           nvidia         tegra20
  whistler                     arm         armv7:arm720t whistler          nvidia         tegra20
  cardhu                       arm         armv7:arm720t cardhu            nvidia         tegra30
 -beaver                       arm         armv7:arm720t cardhu            nvidia         tegra30
 +beaver                       arm         armv7:arm720t beaver            nvidia         tegra30
  dalmore                      arm         armv7:arm720t dalmore           nvidia         tegra114
  colibri_t20_iris             arm         armv7:arm720t colibri_t20_iris  toradex        tegra20
  u8500_href                   arm         armv7       u8500               st-ericsson    u8500
@@@ -348,11 -341,9 +350,11 @@@ pdnb3                        ar
  scpu                         arm         ixp         pdnb3               prodrive       -           pdnb3:SCPU
  balloon3                     arm         pxa
  h2200                        arm         pxa
 +lp8x4x                       arm         pxa         lp8x4x              icpdas
  lubbock                      arm         pxa
  palmld                       arm         pxa
  palmtc                       arm         pxa
 +palmtreo680                  arm         pxa
  polaris                      arm         pxa         trizepsiv           -              -           trizepsiv:POLARIS
  pxa255_idp                   arm         pxa
  trizepsiv                    arm         pxa
@@@ -605,6 -596,9 +607,6 @@@ TQM5200_B_HIGHBOOT           powerp
  TQM5200S                     powerpc     mpc5xxx     tqm5200             tqc            -           TQM5200:TQM5200_B,TQM5200S
  TQM5200S_HIGHBOOT            powerpc     mpc5xxx     tqm5200             tqc            -           TQM5200:TQM5200_B,TQM5200S,SYS_TEXT_BASE=0xFFF00000
  TQM5200_STK100               powerpc     mpc5xxx     tqm5200             tqc            -           TQM5200:STK52XX_REV100
 -Alaska8220                   powerpc     mpc8220     alaska
 -sorcery                      powerpc     mpc8220
 -Yukon8220                    powerpc     mpc8220     alaska
  A3000                        powerpc     mpc824x     a3000
  CPC45                        powerpc     mpc824x     cpc45               -              -           CPC45
  CPC45_ROMBOOT                powerpc     mpc824x     cpc45               -              -           CPC45:BOOT_ROM
@@@ -897,9 -891,6 +899,9 @@@ P5020DS_SECURE_BOOT          powerp
  P5020DS_SPIFLASH           powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
  P5020DS_SRIO_PCIE_BOOT          powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000
  P5040DS                      powerpc     mpc85xx     corenet_ds          freescale
 +P5040DS_NAND               powerpc     mpc85xx     corenet_ds          freescale      -           P5040DS:RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF80000
 +P5040DS_SDCARD                     powerpc     mpc85xx     corenet_ds          freescale      -           P5040DS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
 +P5040DS_SPIFLASH           powerpc     mpc85xx     corenet_ds          freescale      -           P5040DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
  BSC9131RDB_SPIFLASH          powerpc     mpc85xx     bsc9131rdb          freescale      -           BSC9131RDB:BSC9131RDB,SPIFLASH
  BSC9132QDS_NOR_DDRCLK100     powerpc     mpc85xx     bsc9132qds          freescale      -           BSC9132QDS:BSC9132QDS,SYS_CLK_100_DDR_100
  BSC9132QDS_NOR_DDRCLK133     powerpc     mpc85xx     bsc9132qds          freescale      -           BSC9132QDS:BSC9132QDS,SYS_CLK_100_DDR_133
@@@ -910,12 -901,9 +912,12 @@@ BSC9132QDS_SPIFLASH_DDRCLK133 powerp
  stxgp3                       powerpc     mpc85xx     stxgp3              stx
  stxssa                       powerpc     mpc85xx     stxssa              stx            -           stxssa
  stxssa_4M                    powerpc     mpc85xx     stxssa              stx            -           stxssa:STXSSA_4M
 -T4240QDS                     powerpc     mpc85xx     t4qds               freescale
 -T4240QDS_SDCARD              powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
 -T4240QDS_SPIFLASH            powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
 +T4240QDS                     powerpc     mpc85xx     t4qds               freescale      -           T4240QDS:PPC_T4240
 +T4240QDS_SDCARD              powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:PPC_T4240,RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
 +T4240QDS_SPIFLASH            powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:PPC_T4240,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
 +T4160QDS                     powerpc     mpc85xx     t4qds               freescale      -           T4240QDS:PPC_T4160
 +T4160QDS_SDCARD              powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:PPC_T4160,RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
 +T4160QDS_SPIFLASH            powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:PPC_T4160,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
  B4860QDS                     powerpc     mpc85xx     b4860qds            freescale      -           B4860QDS:PPC_B4860
  B4860QDS_NAND              powerpc     mpc85xx     b4860qds            freescale      -           B4860QDS:PPC_B4860,RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF80000
  B4860QDS_SPIFLASH            powerpc     mpc85xx     b4860qds            freescale    -           B4860QDS:PPC_B4860,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000