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

Albert ARIBAUD
2012-02-03T18:49:56Z

Hi Tom,

Le 02/02/2012 19:10, Tom Rini a ?crit :
> Hello,
>
> The following changes since commit 78936e6d110bbcfe6db3406456c16a7a174ae031:
> Tom Rini (1):
> OMAP3: Correct get_sdr_cs_offset mask
>
> are available in the git repository at:
>
> git://git.denx.de/u-boot-ti.git master
>
> Dechesne, Nicolas (1):
> OMAP SPL: Fix missing timer_init() call in OMAP4 s_init()
>
> Heiko Schocher (7):
> arm, davinci: add workaround for not resetting DMA bus and VPSS modules
> arm, davinci: add timer defines for tcr field
> common: add possibility for readline_into_buffer timeout
> common, menu: add statusline support
> common, menu: show menu on startup if CONFIG_MENU_SHOW is defined
> common, menu: do not trigger timeout again, if a line is read
> arm, davinci: cam_enc_4xx board updates
>
> Thomas Weber (1):
> OMAP3: Add Corscience Tricorder board
>
> MAINTAINERS | 1 +
> arch/arm/cpu/arm926ejs/davinci/dm365_lowlevel.c | 52 ++-
> arch/arm/cpu/armv7/omap-common/hwinit-common.c | 2 +
> arch/arm/include/asm/arch-davinci/dm365_lowlevel.h | 1 -
> arch/arm/include/asm/arch-davinci/hardware.h | 9 +
> arch/arm/include/asm/arch-davinci/timer_defs.h | 16 +
> board/ait/cam_enc_4xx/cam_enc_4xx.c | 667 +++++++++++++++++++-
> board/ait/cam_enc_4xx/ublimage.cfg | 3 +-
> board/corscience/tricorder/Makefile | 46 ++
> board/corscience/tricorder/tricorder.c | 105 +++
> board/corscience/tricorder/tricorder.h | 375 +++++++++++
> boards.cfg | 1 +
> common/cmd_nvedit.c | 2 +-
> common/main.c | 24 +-
> common/menu.c | 15 +-
> doc/README.menu | 10 +
> include/common.h | 3 +-
> include/configs/cam_enc_4xx.h | 131 +++-
> include/configs/tricorder.h | 320 ++++++++++
> include/menu.h | 4 +
> 20 files changed, 1745 insertions(+), 42 deletions(-)
> create mode 100644 board/corscience/tricorder/Makefile
> create mode 100644 board/corscience/tricorder/tricorder.c
> create mode 100644 board/corscience/tricorder/tricorder.h
> create mode 100644 include/configs/tricorder.h
>
> After talking with Wolfgang off-list, he's fine with the common menu
> changes coming in via this tree.

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

Amicalement,
--
Albert.