Merge remote-tracking branch 'u-boot-ti/master'

diff --combined MAINTAINERS
index 5a500c5,f4625c3..12fa853
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -214,7 -214,9 +214,7 @@@ Siddarth Gore <gores@marvell.com
  Paul Gortmaker <paul.gortmaker@windriver.com>
  
        sbc8349         MPC8349
 -      sbc8540         MPC8540
        sbc8548         MPC8548
 -      sbc8560         MPC8560
        sbc8641d        MPC8641D
  
  Frank Gottschling <fgottschling@eltec.de>
@@@ -571,6 -573,10 +571,10 @@@ Albert ARIBAUD <albert.u.boot@aribaud.n
  
        edminiv2        ARM926EJS (Orion5x SoC)
  
+ Raphael Assenat <raph@8d.com>
+ 
+       eco5pk          ARM ARMV7 (AM35x SoC)
+ 
  Stefano Babic <sbabic@denx.de>
  
        ea20            davinci
@@@ -902,10 -908,6 +906,10 @@@ Michal Simek <monstr@monstr.eu
  
        zynq            ARM ARMV7 (Zynq SoC)
  
 +Lucas Stach <dev@lynxeye.de>
 +
 +      colibri_t20_iris        Tegra20 (ARM7 & A9 Dual Core)
 +
  Nick Thompson <nick.thompson@gefanuc.com>
  
        da830evm        ARM926EJS (DA830/OMAP-L137)
@@@ -1015,6 -1017,10 +1019,10 @@@ Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj
  
        armadillo-800eva        R8A7740 (RMOBILE SoC)
  
+ Pali Rohár <pali.rohar@gmail.com>
+ 
+       nokia_rx51      ARM ARMV7 (OMAP34xx SoC)
+ 
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:

diff --combined README
index 69da2b8,61e2e1f..2572add
--- 1/README
--- 2/README
+++ b/README
@@@ -363,12 -363,6 +363,12 @@@ The following options need to be config
                ICache only when Code runs from RAM.
  
  - 85xx CPU Options:
 +              CONFIG_SYS_PPC64
 +
 +              Specifies that the core is a 64-bit PowerPC implementation (implements
 +              the "64" category of the Power ISA). This is necessary for ePAPR
 +              compliance, among other possible reasons.
 +
                CONFIG_SYS_FSL_TBCLK_DIV
  
                Defines the core time base clock divider ratio compared to the
@@@ -661,6 -655,10 +661,10 @@@
                                                additional board info beside
                                                the logo
  
+               When CONFIG_CFB_CONSOLE_ANSI is defined, console will support
+               a limited number of ANSI escape sequences (cursor control,
+               erase functions and limited graphics rendition control).
+ 
                When CONFIG_CFB_CONSOLE is defined, video console is
                default i/o. Serial console can be forced with
                environment 'console=serial'.
@@@ -1090,7 -1088,7 +1094,7 @@@
                CONFIG_CALXEDA_XGMAC
                Support for the Calxeda XGMAC device
  
 -              CONFIG_DRIVER_LAN91C96
 +              CONFIG_LAN91C96
                Support for SMSC's LAN91C96 chips.
  
                        CONFIG_LAN91C96_BASE
@@@ -1100,7 -1098,7 +1104,7 @@@
                        CONFIG_LAN91C96_USE_32_BIT
                        Define this to enable 32 bit addressing
  
 -              CONFIG_DRIVER_SMC91111
 +              CONFIG_SMC91111
                Support for SMSC's LAN91C111 chip
  
                        CONFIG_SMC91111_BASE
@@@ -1322,13 -1320,6 +1326,13 @@@
                This will also enable the command "fatwrite" enabling the
                user to write files to FAT.
  
 +CBFS (Coreboot Filesystem) support
 +              CONFIG_CMD_CBFS
 +
 +              Define this to enable support for reading from a Coreboot
 +              filesystem. Available commands are cbfsinit, cbfsinfo, cbfsls
 +              and cbfsload.
 +
  - Keyboard Support:
                CONFIG_ISA_KEYBOARD
  

diff --combined boards.cfg
index c45556e,36415a7..25c53d4
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -225,7 -225,12 +225,12 @@@ versatileqemu                ar
  integratorap_cm946es         arm         arm946es    integrator          armltd         -               integratorap:CM946ES
  integratorcp_cm946es         arm         arm946es    integrator          armltd         -               integratorcp:CM946ES
  ca9x4_ct_vxp                 arm         armv7       vexpress            armltd
- am335x_evm                   arm         armv7       am335x              ti             am33xx
+ am335x_evm                   arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1
+ am335x_evm_uart1             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL2,CONS_INDEX=2
+ am335x_evm_uart2             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL3,CONS_INDEX=3
+ am335x_evm_uart3             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL4,CONS_INDEX=4
+ am335x_evm_uart4             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL5,CONS_INDEX=5
+ am335x_evm_uart5             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL6,CONS_INDEX=6
  highbank                     arm         armv7       highbank            -              highbank
  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
  mx51_efikasb                 arm         armv7       mx51_efikamx        genesi         mx5           mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_sb.cfg
@@@ -240,6 -245,7 +245,7 @@@ mx6qarm2                     ar
  mx6qsabreauto                arm         armv7       mx6qsabreauto       freescale      mx6           mx6qsabreauto:IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg
  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
+ eco5pk                       arm         armv7       eco5pk              8dtech         omap3
  cm_t35                       arm         armv7       cm_t35              -              omap3
  omap3_overo                  arm         armv7       overo               -              omap3
  omap3_pandora                arm         armv7       pandora             -              omap3
@@@ -264,6 -270,7 +270,7 @@@ devkit8000                   ar
  mcx                          arm         armv7       mcx                 htkw           omap3
  tricorder                    arm         armv7       tricorder           corscience     omap3
  twister                      arm         armv7       twister             technexion     omap3
+ nokia_rx51                   arm         armv7       rx51                nokia          omap3
  omap4_panda                  arm         armv7       panda               ti             omap4
  omap4_sdp4430                arm         armv7       sdp4430             ti             omap4
  omap5_evm                    arm         armv7       omap5_evm           ti           omap5
@@@ -278,7 -285,6 +285,7 @@@ harmony                      ar
  seaboard                     arm         armv7:arm720t seaboard          nvidia         tegra20
  ventana                      arm         armv7:arm720t ventana           nvidia         tegra20
  whistler                     arm         armv7:arm720t whistler          nvidia         tegra20
 +colibri_t20_iris             arm         armv7:arm720t colibri_t20_iris  toradex        tegra20
  u8500_href                   arm         armv7       u8500               st-ericsson    u8500
  snowball                     arm         armv7       snowball               st-ericsson    u8500
  kzm9g                        arm         armv7       kzm9g               kmc            rmobile
@@@ -381,12 -387,6 +388,12 @@@ M53017EVB                    m68
  M5329AFEE                    m68k        mcf532x     m5329evb            freescale      -           M5329EVB:NANDFLASH_SIZE=0
  M5329BFEE                    m68k        mcf532x     m5329evb            freescale      -           M5329EVB:NANDFLASH_SIZE=16
  M5373EVB                     m68k        mcf532x     m5373evb            freescale      -           M5373EVB:NANDFLASH_SIZE=16
 +M54418TWR                    m68k        mcf5445x    m54418twr           freescale      -           M54418TWR:CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000
 +M54418TWR_nand_mii           m68k        mcf5445x    m54418twr           freescale      -           M54418TWR:SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000
 +M54418TWR_nand_rmii          m68k        mcf5445x    m54418twr           freescale      -           M54418TWR:SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000
 +M54418TWR_nand_rmii_lowfreq  m68k        mcf5445x    m54418twr           freescale      -           M54418TWR:SYS_NAND_BOOT,LOW_MCFCLK,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000
 +M54418TWR_serial_mii         m68k        mcf5445x    m54418twr           freescale      -           M54418TWR:CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000
 +M54418TWR_serial_rmii        m68k        mcf5445x    m54418twr           freescale      -           M54418TWR:CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000
  M54451EVB                    m68k        mcf5445x    m54451evb           freescale      -           M54451EVB:SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=24000000
  M54451EVB_stmicro            m68k        mcf5445x    m54451evb           freescale      -           M54451EVB:CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x47e00000,SYS_INPUT_CLKSRC=24000000
  M54455EVB                    m68k        mcf5445x    m54455evb           freescale      -           M54455EVB:SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=33333333
@@@ -412,8 -412,6 +419,8 @@@ M5485HFE                m68k        mcf547x_8x  
  microblaze-generic           microblaze  microblaze  microblaze-generic  xilinx
  qemu_mips                    mips        mips32      qemu-mips           -              -           qemu-mips:SYS_BIG_ENDIAN
  qemu_mipsel                  mips        mips32      qemu-mips           -              -           qemu-mips:SYS_LITTLE_ENDIAN
 +qemu_mips64                  mips        mips64      qemu-mips           -              -           qemu-mips64:SYS_BIG_ENDIAN
 +qemu_mips64el                mips        mips64      qemu-mips           -              -           qemu-mips64:SYS_LITTLE_ENDIAN
  vct_platinum                 mips        mips32      vct                 micronas       -           vct:VCT_PLATINUM
  vct_platinumavc              mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC
  vct_platinumavc_onenand      mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_ONENAND
@@@ -554,6 -552,7 +561,6 @@@ Alaska8220                   powerp
  sorcery                      powerpc     mpc8220
  Yukon8220                    powerpc     mpc8220     alaska
  A3000                        powerpc     mpc824x     a3000
 -BMW                          powerpc     mpc824x     bmw
  CPC45                        powerpc     mpc824x     cpc45               -              -           CPC45
  CPC45_ROMBOOT                powerpc     mpc824x     cpc45               -              -           CPC45:BOOT_ROM
  CU824                        powerpc     mpc824x     cu824
@@@ -686,16 -685,21 +693,16 @@@ MVBLM7                       powerp
  SIMPC8313_LP                 powerpc     mpc83xx     simpc8313           sheldon        -           SIMPC8313:NAND_LP
  SIMPC8313_SP                 powerpc     mpc83xx     simpc8313           sheldon        -           SIMPC8313:NAND_SP
  TQM834x                      powerpc     mpc83xx     tqm834x             tqc
 -suvd3                        powerpc     mpc83xx     km83xx              keymile
 +suvd3                        powerpc     mpc83xx     km83xx              keymile        -           suvd3:SUVD3
 +kmvect1                      powerpc     mpc83xx     km83xx              keymile        -           suvd3:KMVECT1
  tuge1                        powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KM_DISABLE_APP2,TUGE1
  tuxx1                        powerpc     mpc83xx     km83xx              keymile
  kmsupx5                      powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KM_DISABLE_APP2,KMSUPX5
 -sbc8540                      powerpc     mpc85xx     sbc8560             -              -           SBC8540
 -sbc8540_33                   powerpc     mpc85xx     sbc8560             -              -           SBC8540
 -sbc8540_66                   powerpc     mpc85xx     sbc8560             -              -           SBC8540
  sbc8548                      powerpc     mpc85xx     sbc8548             -              -           sbc8548
  sbc8548_PCI_33               powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,33
  sbc8548_PCI_33_PCIE          powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,33,PCIE
  sbc8548_PCI_66               powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,66
  sbc8548_PCI_66_PCIE          powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,66,PCIE
 -sbc8560                      powerpc     mpc85xx     sbc8560             -              -           sbc8560
 -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
@@@ -846,9 -850,6 +853,9 @@@ BSC9131RDB_SPIFLASH          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
  xpedite520x                  powerpc     mpc85xx     -                   xes
  xpedite537x                  powerpc     mpc85xx     -                   xes
  xpedite550x                  powerpc     mpc85xx     -                   xes