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

diff --combined MAINTAINERS
index 4033b882cc0e2ea51be4c616ac006032d56189de,0a900dcdf24eb70ffb68067b1a121f474642f9ee..23965a8d3359f7325cc449b23e21f527222f0446
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -448,7 -448,6 +448,7 @@@ Heiko Schocher <hs@denx.de
        cam_enc_4xx     davinci/ARM926EJS
        charon          MPC5200
        ids8247         MPC8247
 +      ipam390         davinci/ARM926EJS
        jupiter         MPC5200
        kmsupx5         MPC8321
        mucmc52         MPC5200
@@@ -602,7 -601,6 +602,6 @@@ Jason Liu <r64343@freescale.com
        mx53evk         i.MX53
        mx53loco        i.MX53
        mx6qarm2        i.MX6Q
-       mx6qsabrelite   i.MX6Q
  
  Enric Balletbo i Serra <eballetbo@iseebcn.com>
  
@@@ -945,10 -943,6 +944,10 @@@ Lucas Stach <dev@lynxeye.de
  
        colibri_t20_iris        Tegra20 (ARM7 & A9 Dual Core)
  
 +Antoine Tenart <atenart@adeneo-embedded.com>
 +
 +      TI816X          ARM ARMV7 (TI816x Soc)
 +
  Nick Thompson <nick.thompson@gefanuc.com>
  
        da830evm        ARM926EJS (DA830/OMAP-L137)
@@@ -1072,6 -1066,7 +1071,7 @@@ Pali Rohár <pali.rohar@gmail.com
        nokia_rx51      ARM ARMV7 (OMAP34xx SoC)
  
  Eric Nelson <eric.nelson@boundarydevices.com>
+       mx6qsabrelite           i.MX6Q          1GB
        nitrogen6dl             i.MX6DL         1GB
        nitrogen6dl2g           i.MX6DL         2GB
        nitrogen6q              i.MX6Q/6D       1GB

diff --combined boards.cfg
index 15ff800398c6fd9caf50761f3038a3381d515ba0,454da7f974dec3d7646c34f31fc01dbf8cdc90e1..d7c8d341b84ed0a8d1e5ffa8db37cc1d9419c895
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -140,7 -140,6 +140,7 @@@ pm9g45                       ar
  portuxg20                    arm         arm926ejs   stamp9g20           taskit         at91        stamp9g20:AT91SAM9G20,PORTUXG20
  stamp9g20                    arm         arm926ejs   stamp9g20           taskit         at91        stamp9g20:AT91SAM9G20
  cam_enc_4xx                  arm         arm926ejs   cam_enc_4xx         ait            davinci     cam_enc_4xx
 +ipam390                      arm         arm926ejs   ipam390             Barix          davinci
  da830evm                     arm         arm926ejs   da8xxevm            davinci        davinci
  da850_am18xxevm              arm         arm926ejs   da8xxevm            davinci        davinci     da850evm:DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50
  da850evm                     arm         arm926ejs   da8xxevm            davinci        davinci     da850evm:MAC_ADDR_IN_SPIFLASH
@@@ -253,9 -252,7 +253,9 @@@ am335x_evm_uart4             ar
  am335x_evm_uart5             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL6,CONS_INDEX=1,NAND
  am335x_evm_usbspl            arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,NAND,SPL_USBETH_SUPPORT
  am335x_boneblack             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,EMMC_BOOT
 +am43xx_evm                   arm         armv7       am43xx              ti             am33xx      am43xx_evm:SERIAL1,CONS_INDEX=1
  ti814x_evm                   arm         armv7       ti814x              ti             am33xx
 +ti816x_evm                   arm         armv7       ti816x              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
@@@ -274,7 -271,7 +274,7 @@@ vision2                      ar
  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,MX6Q
- mx6qsabrelite                arm         armv7       mx6qsabrelite       freescale      mx6           mx6qsabrelite:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
+ mx6qsabrelite                arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE
  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