[U-Boot] Pull request: u-boot-arm/master

[Tom Rini <trini@ti.com>]

On Sat, Nov 09, 2013 at 11:53:22PM +0100, Albert ARIBAUD wrote:

> Hi Tom,
> 
> The following changes since commit
> 15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f:
> 
>   Merge branch 'master' of git://www.denx.de/git/u-boot-usb (2013-11-08
>   15:25:29 -0500)
> 
> are available in the git repository at:
> 
> 
>   git://git.denx.de/u-boot-arm master
> 
> for you to fetch changes up to 85b8c5c4bf80025de4632ae6c9a8a606e51508a4:
> 
>   Merge branch 'iu-boot/master' into 'u-boot-arm/master' (2013-11-09
>   22:59:47 +0100)
> 
> NOTE 1: the top of u-boot-arm/master is a merge from u-boot/master with
> 	non-trivial conflict resolutions, involving some changes to
> 	non-conflicting files too. See 'git show 85b8c5c4' for details.
> 
> NOTE 2: eleven ARM targets fail with a warning about CONFIG_SYS_HZ:
> 	omap730p2_cs3boot omap730p2_cs0boot scb9328 palmtc balloon3
> 	mini2440 zipitz2 palmld omap730p2 omap3_zoom2 mx1ads. These
> 	failures already happen on u-boot/master and are thus not due
> 	to the ARM branch.
> 
> ----------------------------------------------------------------
> 
> Albert ARIBAUD (3):
>       Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
>       Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
>       Merge branch 'iu-boot/master' into 'u-boot-arm/master'
> 
> Anatolij Gustschin (1):
>       imx_watchdog: do not soft-reset while watchdog init
> 
> Andreas Bie??mann (10):
>       tricorder: update flash partitioning
>       tricorder: use generic provided loadaddr
>       tricorder: add configuration for a flashcard u-boot
>       tricorder: add cmdline history
>       tricorder: add mtdparts to environment
>       tricorder: add tricordereeprom command
>       tricorder: panic() on unknown board
>       tricorder: add led support
>       tricorder: read kernel directly from NAND
>       tricorder: support 256MiB SDRAM on revision > D
> 
> Bo Shen (3):
>       net: macb: get DMA bus width from design config register
>       arm: atmel: at91sam9n12ek: add usb host support
>       arm: atmel: get rid of too many ifdeffery
> 
> Christoph G. Baumann (1):
>       ARM: mxs: Configure 2 Gbit DDR2 RAM for BG0900
> 
> Eric Nelson (1):
>       i.MX6: nitrogen6x: fix erase size in 6x_upgrade.txt
> 
> Fabio Estevam (5):
>       udoo: Add initial support for mx6q udoo board
>       ARM: mx5: Enable L2 cache
>       mx5: lowlevel_init: Remove unused macro
>       configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boards
>       wandboard: README: Include the quad version
> 
> Heiko Schocher (2):
>       nand, davinci: add special UBL ecc position
>       arm, da85x: update for the ipam390 board
> 
> Igor Grinberg (2):
>       cm-t35: move the eeprom code to common place
>       cm-t35: move the display code to common place
> 
> Javier Martinez Canillas (2):
>       ARM: IGEP0033: rename config file to am335x_igep0033.h
>       OMAP3: igep00x0: rename config file to omap3_igep00x0.h
> 
> Jens Scharsig (BuS Elektronik) (1):
>       ARM: ATMEL: eb_cpux9k2: fix TEXT_BASE for ramboot target
> 
> Lokesh Vutla (1):
>       ARM: OMAP4: Convert to ti_armv7_common.h
> 
> Marek Vasut (4):
>       ARM: mxs: tools: Use mkimage for BootStream generation
>       ARM: mxs: Add PPC-AG BG0900 board
>       ARM: mxs: Setup stack in JTAG mode
>       ARM: mxs: Enable DCDC converter for battery boot
> 
> Michal Simek (1):
>       zynq: Use arch_cpu_init() instead of lowlevel_init()
> 
> Minal Shah (1):
>       dra7xx_evm: Enabled UART-boot mode and add dra7xx_evm_uart3 build
> 
> Nikita Kiryanov (3):
>       cm_t35: reduce default bootdelay to 3 seconds
>       cm_t35: turn on GPIO commands
>       cm_t35: update lcd predefines
> 
> Otavio Salvador (1):
>       mx6: Remove PAD_CTL_DSE_120ohm from i.MX6DL's IPU1_DI0_PIN4 pin
> 
> Pierre Aubert (1):
>       mx6: compute PLL PFD frequencies rather than using defines
> 
> Roger Meier (1):
>       at91: add defines for reset type
> 
> SRICHARAN R (1):
>       ARM: OMAP5: DDR3: Change io settings
> 
> Stefan Roese (1):
>       arm: Remove IXP425 boards pdnb3 and scpu
> 
> Stefano Babic (1):
>       Revert "configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL
> boards"
> 
> Thomas Weber (3):
>       tricorder: remove lcdmode from bootargs
>       tricorder: Make u-boot faster
>       tricorder: switch to alternative memtest
> 
> Tom Rini (7):
>       drivers/rtc/davinci.c: Reference DAVINCI_RTC_BASE more directly
>       am33xx, davinci: Create and use <asm/davinci_rtc.h>
>       bootcount_davinci: Switch to scratch register #2
>       TI:am33xx: Add bootcount support to ti_am335x_common.h
>       am335x: Enable CONFIG_OMAP_WATCHDOG support
>       TI:armv7: Change CONFIG_SYS_SPL_ARGS_ADDR to a higher address
>       TI:omap5: Add rdaddr, use consistent loadaddr values
> 
>  arch/arm/cpu/arm926ejs/mxs/Makefile                         |  10 ++--
>  arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg                |   4 +-
>  arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg                |   4 +-
>  arch/arm/cpu/arm926ejs/mxs/spl_power_init.c                 |   2 +
>  arch/arm/cpu/arm926ejs/mxs/start.S                          |   9 +++
>  arch/arm/cpu/armv7/am33xx/board.c                           |   7 ++-
>  arch/arm/cpu/armv7/mx5/lowlevel_init.S                      |  12 ++--
>  arch/arm/cpu/armv7/mx6/clock.c                              |  56
>  ++++++++++++++-----
>  arch/arm/cpu/armv7/omap-common/boot-common.c                |   4 ++
>  arch/arm/cpu/armv7/zynq/cpu.c                               |   6 ++
>  arch/arm/include/asm/arch-am33xx/cpu.h                      |   9 ---
>  arch/arm/include/asm/arch-at91/at91_pmc.h                   |   2 +
>  arch/arm/include/asm/arch-at91/at91_rstc.h                  |   7 +++
>  arch/arm/include/asm/arch-davinci/hardware.h                |  38
>  -------------
>  arch/arm/include/asm/arch-mx6/crm_regs.h                    |  11 ----
>  arch/arm/include/asm/arch-mx6/mx6dl_pins.h                  |   2 +-
>  arch/arm/include/asm/arch-mxs/sys_proto.h                   |   2 +
>  arch/arm/include/asm/arch-omap5/omap.h                      |   4 +-
>  arch/arm/include/asm/arch-omap5/spl.h                       |   1 +
>  arch/arm/include/asm/davinci_rtc.h                          |  52
>  +++++++++++++++++
>  board/Barix/ipam390/ipam390-ais-uart.cfg                    |   2 +-
>  board/Barix/ipam390/ipam390.c                               |  29
>  +++------- board/atmel/at91sam9n12ek/at91sam9n12ek.c
>  |  11 ++++ board/boundary/nitrogen6x/6x_upgrade.txt
>  |   2 +- board/compulab/cm_t35/Makefile
>  |   3 - board/compulab/cm_t35/cm_t35.c
>  |   7 +-- board/compulab/common/Makefile
>  |  10 ++++ board/compulab/{cm_t35 => common}/eeprom.c
>  |  51 +++++++++-------- board/compulab/{cm_t35 =>
>  common}/eeprom.h                  |   8 +--
>  board/compulab/{cm_t35/display.c => common/omap3_display.c} |   8 ++-
>  board/corscience/tricorder/Makefile                         |   2 +-
>  board/corscience/tricorder/led.c                            |  80
>  +++++++++++++++++++++++++++
>  board/corscience/tricorder/tricorder-eeprom.c               | 251
>  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  board/corscience/tricorder/tricorder-eeprom.h               |  41
>  ++++++++++++++
>  board/corscience/tricorder/tricorder.c                      | 126
>  ++++++++++++++++++++++++++++++++++++++---
>  board/corscience/tricorder/tricorder.h                      |   4 +-
>  board/enbw/enbw_cmc/enbw_cmc.c                              |   1 +
>  board/{prodrive/pdnb3 => ppcag/bg0900}/Makefile             |   8 ++-
>  board/ppcag/bg0900/bg0900.c                                 |  86
>  ++++++++++++++++++++++++++++
>  board/ppcag/bg0900/spl_boot.c                               | 153
>  ++++++++++++++++++++++++++++++++++++++++++++++++++
>  board/prodrive/pdnb3/flash.c                                |  73
>  ------------------------
>  board/prodrive/pdnb3/nand.c                                 | 129
>  ------------------------------------------
>  board/prodrive/pdnb3/pdnb3.c                                | 220
>  ------------------------------------------------------------------------
>  board/ti/am335x/board.c                                     |   6 ++
>  board/udoo/Makefile                                         |   7 +++
>  board/udoo/udoo.c                                           | 110
>  ++++++++++++++++++++++++++++++++++++
>  board/wandboard/README                                      |   4 +-
>  boards.cfg                                                  |  20
>  ++++--- doc/README.mxs                                              |
>  39 ++++++++++---
>  doc/README.scrapyard                                        |   4 +-
>  drivers/bootcount/Makefile                                  |   1 +
>  drivers/bootcount/bootcount_davinci.c                       |  13
>  +++-- drivers/mtd/nand/davinci_nand.c                             |
>  12 ++++ drivers/net/macb.c                                          |
>  20 ++++++- drivers/net/macb.h
>  |  11 ++++ drivers/rtc/davinci.c
>  |   8 +-- drivers/usb/host/ohci-at91.c
>  |  19 ++++---
>  drivers/watchdog/imx_watchdog.c                             |   3 +-
>  include/configs/afeb9260.h                                  |   1 +
>  include/configs/{igep0033.h => am335x_igep0033.h}           |   0
>  include/configs/at91rm9200ek.h                              |   1 +
>  include/configs/at91sam9260ek.h                             |   1 +
>  include/configs/at91sam9261ek.h                             |   1 +
>  include/configs/at91sam9263ek.h                             |   1 +
>  include/configs/at91sam9n12ek.h                             |  13
>  +++++ include/configs/at91sam9x5ek.h                              |
>  3 +- include/configs/bg0900.h                                    |  97
>  ++++++++++++++++++++++++++++++++
>  include/configs/cm_t35.h                                    |   3 +-
>  include/configs/cpu9260.h                                   |   1 +
>  include/configs/cpuat91.h                                   |   1 +
>  include/configs/dra7xx_evm.h                                |   9 ++-
>  include/configs/eb_cpux9k2.h                                |   4 +-
>  include/configs/ethernut5.h                                 |   1 +
>  include/configs/ipam390.h                                   |  35
>  +++++++-----
>  include/configs/meesc.h                                     |   1 +
>  include/configs/{igep00x0.h => omap3_igep00x0.h}            |   0
>  include/configs/omap4_common.h                              | 187
>  +++++++++----------------------------------------------------
>  include/configs/omap4_panda.h                               |   2 -
>  include/configs/omap4_sdp4430.h                             |   2 -
>  include/configs/omap5_common.h                              |   7 ++-
>  include/configs/otc570.h                                    |   1 +
>  include/configs/pdnb3.h                                     | 320
>  ---------------------------------------------------------------------------------------------------------
>  include/configs/pm9261.h                                    |   1 +
>  include/configs/pm9263.h                                    |   1 +
>  include/configs/pm9g45.h                                    |   1 +
>  include/configs/sama5d3xek.h                                |   1 +
>  include/configs/sbc35_a9g20.h                               |   1 +
>  include/configs/snapper9260.h                               |   1 +
>  include/configs/stamp9g20.h                                 |   1 +
>  include/configs/ti_am335x_common.h                          |  14
>  +++++ include/configs/ti_armv7_common.h                           |
>  2 +- include/configs/top9000.h                                   |   1
>  + include/configs/tricorder.h                                 | 155
>  ++++++++++++++++++++++++++++++++++++++-------------
>  include/configs/udoo.h                                      | 206
>  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  include/configs/vl_ma2sc.h                                  |   1 + 95
>  files changed, 1730 insertions(+), 1172 deletions(-) create mode
>  100644 arch/arm/include/asm/davinci_rtc.h create mode 100644
>  board/compulab/common/Makefile rename board/compulab/{cm_t35 =>
>  common}/eeprom.c (60%) rename board/compulab/{cm_t35 =>
>  common}/eeprom.h (62%) rename board/compulab/{cm_t35/display.c =>
>  common/omap3_display.c} (97%) create mode 100644
>  board/corscience/tricorder/led.c create mode 100644
>  board/corscience/tricorder/tricorder-eeprom.c create mode 100644
>  board/corscience/tricorder/tricorder-eeprom.h rename
>  board/{prodrive/pdnb3 => ppcag/bg0900}/Makefile (50%) create mode
>  100644 board/ppcag/bg0900/bg0900.c create mode 100644
>  board/ppcag/bg0900/spl_boot.c delete mode 100644
>  board/prodrive/pdnb3/flash.c delete mode 100644
>  board/prodrive/pdnb3/nand.c delete mode 100644
>  board/prodrive/pdnb3/pdnb3.c create mode 100644 board/udoo/Makefile
>  create mode 100644 board/udoo/udoo.c rename
>  include/configs/{igep0033.h => am335x_igep0033.h} (100%) create mode
>  100644 include/configs/bg0900.h rename include/configs/{igep00x0.h =>
>  omap3_igep00x0.h} (100%) delete mode 100644 include/configs/pdnb3.h
>  create mode 100644 include/configs/udoo.h

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131111/1e1bbf39/attachment.pgp>