On Tue, Jan 08, 2013 at 04:07:59PM +0100, Albert ARIBAUD wrote:
Hello Tom,
The following changes since commit 96764df1b47ddebfb50fadf5af72530b07b5fc89:
Merge samsung, imx, tegra into u-boot-arm/master (2012-12-22 11:59:14 +0100)
are available in the git repository at:
git://git.denx.de/u-boot-arm.git master
for you to fetch changes up to 7528cf5f016b5b8b8b12b373f6f31a10bf89233d:
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-01-08 14:59:37 +0100)
Albert ARIBAUD (2): Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Andreas Bie??mann (1): omap3/mem.c: remove unused defines
Ashok (1): mx35pdk:Use IMX_GPIO_NR macro
Davide Bonfanti (1): davinci: fixed cpu reset
Fabio Estevam (6): mx35pdk: Allow booting of a device tree kernel mx53loco: Call PMIC related functions from board_late_init() mx51evk: Remove unneeded comment mx53loco: Remove unneeded 'retval' variable mx53loco: Improve error handling on power_init() tools: imximage: Load a size that is multiple of 512
Ilya Yanok (6): OMAP: include sys_proto.h from boot-common am335x_evm: add nand pinmux definition am33xx: NAND support am335x_evm: enable NAND support am33xx_spl_bch: simple SPL nand loader for AM33XX am335x_evm: enable SPL NAND support
Lokesh Vutla (1): omap: emif: configure emif only when required
Mansoor Ahamed (2): am33xx: add ELM support omap_gpmc: BCH8 support (ELM based)
Marek Vasut (1): mxs: Add NAND fdt and ramdisk partition to m28evk
Nikita Kiryanov (2): gpio: add gpio_is_valid() to omap_gpio API cm-t35: enable zero bootdelay check
Otavio Salvador (4): mx53loco: We shouldn't hardcode a rootfs filesystem type mx53loco: Change default loadaddr to 0x72000000 mx6qsabrelite: Change default loadaddr to 0x12000000 mx6qsabre_common: Change default loadaddr to 0x12000000
Peter Barada (1): Pass sdrc timing values through board_sdrc_timings structure
Robert P. J. Day (4): omap3_beagle.h: Fix comment for true/false return value. omap3: Add a few comments to "#endif"s for readability. omap4: Add comments on some "#endif"s for readability. OMAP: Tweak omap-common/Makefile since reset.S -> reset.c
Shawn Guo (3): fsl_esdhc: add MMC_MODE_HC host_caps mx6qsabresd: add usdhc2 and usdhc4 support mx6qsabresd: use on-board eMMC to store environment
Stefano Babic (2): OMAP3: fix panel timing on the mt_ventoux board OMAP3: TAM3517: add macros for reading eeprom
Thomas Weber (1): OMAP3: Remove unused PHYS_SDRAM_1_SIZE
Vincent Stehl?? (2): omap24xx_i2c: Handle wait_for_bb error power: twl6035: complain on LDO9 error
Yegor Yefremov (2): am335x: disable internal delay for RGMII mode am335x: cpsw: make phy address configurable
ajoy (1): OMAP3 SPI : Fixed bugs related to SPI transfer
arch/arm/cpu/arm926ejs/davinci/reset.c | 2 +- arch/arm/cpu/armv7/am33xx/Makefile | 2 + arch/arm/cpu/armv7/am33xx/board.c | 1 + arch/arm/cpu/armv7/am33xx/clock.c | 10 + arch/arm/cpu/armv7/am33xx/elm.c | 212 ++++++++++++++ arch/arm/cpu/armv7/am33xx/mem.c | 101 +++++++ arch/arm/cpu/armv7/omap-common/Makefile | 5 +- arch/arm/cpu/armv7/omap-common/boot-common.c | 1 + arch/arm/cpu/armv7/omap-common/emif-common.c | 41 ++- arch/arm/cpu/armv7/omap3/board.c | 4 +- arch/arm/cpu/armv7/omap3/mem.c | 18 +- arch/arm/cpu/armv7/omap3/sdrc.c | 36 +-- arch/arm/cpu/armv7/omap4/clocks.c | 2 +- arch/arm/cpu/armv7/omap4/hwinit.c | 4 +- arch/arm/include/asm/arch-am33xx/cpu.h | 53 ++++ arch/arm/include/asm/arch-am33xx/elm.h | 93 ++++++ arch/arm/include/asm/arch-am33xx/hardware.h | 3 + arch/arm/include/asm/arch-am33xx/mem.h | 83 ++++++ arch/arm/include/asm/arch-am33xx/omap_gpmc.h | 120 ++++++++ arch/arm/include/asm/arch-am33xx/sys_proto.h | 3 + arch/arm/include/asm/arch-omap3/sys_proto.h | 13 +- arch/arm/include/asm/omap_gpio.h | 7 + board/corscience/tricorder/tricorder.c | 13 +- board/freescale/mx35pdk/mx35pdk.c | 2 +- board/freescale/mx53loco/mx53loco.c | 84 ++++-- board/freescale/mx6qsabresd/mx6qsabresd.c | 80 ++++- board/isee/igep0020/igep0020.c | 29 +- board/isee/igep0030/igep0030.c | 29 +- board/overo/overo.c | 37 ++- board/technexion/twister/twister.c | 10 +- board/teejet/mt_ventoux/mt_ventoux.c | 23 +- board/ti/am335x/board.c | 4 +- board/ti/am335x/mux.c | 22 ++ board/ti/beagle/beagle.c | 53 ++-- board/ti/evm/evm.c | 19 +- board/timll/devkit8000/devkit8000.c | 13 +- drivers/gpio/omap_gpio.c | 10 +- drivers/i2c/omap24xx_i2c.c | 20 +- drivers/mmc/fsl_esdhc.c | 2 +- drivers/mtd/nand/Makefile | 5 +- drivers/mtd/nand/am335x_spl_bch.c | 238 +++++++++++++++ drivers/mtd/nand/omap_gpmc.c | 403 +++++++++++++++++++++++++- drivers/net/cpsw.c | 5 +- drivers/power/twl6035.c | 17 +- drivers/spi/omap3_spi.c | 76 +++-- drivers/spi/omap3_spi.h | 1 + include/configs/am335x_evm.h | 50 ++++ include/configs/cm_t35.h | 2 +- include/configs/dig297.h | 1 - include/configs/igep00x0.h | 1 - include/configs/m28evk.h | 2 + include/configs/mcx.h | 1 - include/configs/mx35pdk.h | 1 + include/configs/mx51evk.h | 4 - include/configs/mx53loco.h | 10 +- include/configs/mx6qsabre_common.h | 4 +- include/configs/mx6qsabreauto.h | 5 + include/configs/mx6qsabrelite.h | 2 +- include/configs/mx6qsabresd.h | 6 + include/configs/omap3_beagle.h | 2 +- include/configs/omap3_mvblx.h | 1 - include/configs/omap3_pandora.h | 1 - include/configs/omap3_sdp3430.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/omap3_zoom2.h | 1 - include/configs/tam3517-common.h | 59 +++- include/configs/tricorder.h | 1 - include/image.h | 3 + include/twl6035.h | 2 +- tools/imximage.c | 9 +- 70 files changed, 1889 insertions(+), 290 deletions(-) create mode 100644 arch/arm/cpu/armv7/am33xx/elm.c create mode 100644 arch/arm/cpu/armv7/am33xx/mem.c create mode 100644 arch/arm/include/asm/arch-am33xx/elm.h create mode 100644 arch/arm/include/asm/arch-am33xx/mem.h create mode 100644 arch/arm/include/asm/arch-am33xx/omap_gpmc.h create mode 100644 drivers/mtd/nand/am335x_spl_bch.c
This has been applied to u-boot/master, thanks! Note that the arm head.S stuff wasn't included in this request, but was in the tree at the time. Per IRC, it broke builds and resulted in v5 of the series which we shall deal with.