[U-Boot] Please pull u-boot-ti/master

Albert ARIBAUD
2012-10-03T00:01:06Z

Hi Tom,

On Mon, 1 Oct 2012 17:12:58 -0700, Tom Rini <trini@ti.com> wrote:

> Hello,
>
> The following changes since commit 1c27059a2f7158a9c9a8778535b030935d75179d:
>
> Merge remote-tracking branch 'u-boot/master' (2012-09-30 23:49:17 +0200)
>
> are available in the git repository at:
>
>
> git://git.denx.de/u-boot-ti.git master
>
> for you to fetch changes up to 3c2e616f4b20e6e23d8268e99beec91b95ce9e70:
>
> omap4_panda: remove CONFIG_PANDA, not used (2012-10-01 10:10:33 -0700)
>
> ----------------------------------------------------------------
> Andreas Bie?mann (1):
> devkit8000: add rootwait to mmcboot option
>
> Bastian Ruppert (6):
> davinci: ea20: reorganisation LCD startup
> davinci: ea20: the console is always set to the serial line
> video: cfb_console: logo can be positioned via the splashpos variable
> video: cfb_console: add function to plot the logo area black
> da850/omap-l138: davinci_emac: Suppress auto negotiation if needed
> davinci: ea20: add some configs and default environmet variables
>
> Ilya Yanok (4):
> net/bootp: add VCI support for BOOTP also
> OMAP: spl: call timer_init() from SPL
> am335x_evm: enable networking in SPL
> OMAP: networking support for SPL
>
> Joel A Fernandes (1):
> am33xx: Fix fetching of mmc1 bootmode from bootrom for AM33XX
>
> Koen Kooi (1):
> am335x-evm config: decrease bootdelay to 1s and mount rootfs RO
>
> Peter Meerwald (1):
> omap4_panda: remove CONFIG_PANDA, not used
>
> arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 5 +-
> arch/arm/include/asm/arch-am33xx/spl.h | 2 +
> board/davinci/ea20/ea20.c | 32 ++++--
> board/ti/beagle/beagle.c | 2 +-
> common/Makefile | 4 +
> common/cmd_nvedit.c | 8 ++
> common/env_common.c | 7 +-
> common/spl/Makefile | 1 +
> common/spl/spl.c | 11 ++
> common/spl/spl_net.c | 52 +++++++++
> drivers/net/davinci_emac.c | 3 +-
> drivers/video/cfb_console.c | 140 +++++++++++++++++++-----
> include/bootstage.h | 6 +-
> include/config_uncmd_spl.h | 44 ++++++++
> include/configs/am335x_evm.h | 9 +-
> include/configs/devkit8000.h | 1 +
> include/configs/ea20.h | 108 +++++++++++-------
> include/configs/omap4_panda.h | 1 -
> include/spl.h | 3 +
> lib/Makefile | 9 +-
> lib/hashtable.c | 2 +
> mkconfig | 1 +
> net/bootp.c | 27 ++++-
> spl/Makefile | 3 +
> 24 files changed, 384 insertions(+), 97 deletions(-)
> create mode 100644 common/spl/spl_net.c
> create mode 100644 include/config_uncmd_spl.h
>
> While we are late in the series, these changes have been around for a
> long while now and the primary delay in merging them has been to wait
> for the rest of my SPL series to hit, make its way up and let me merge
> that with these changes.
>

Applied to u-boot-arm/master, thanks!

Amicalement,
--
Albert.