On Fri, May 30, 2014 at 05:20:48PM +0200, Albert ARIBAUD wrote:

Hi Tom,

The following changes since commit 9665fa8f9e1488209d5e01d0792c243e0a220c5a:

Merge branch 'master' of git://git.denx.de/u-boot-arm (2014-05-24 06:34:08 -0400)

are available in the git repository at:

git://git.denx.de/u-boot-arm master

for you to fetch changes up to 9637a1bb896efe392a58dd2772e2c3fcb646409d:

ARM: at91sam9m10g45ek: add mmc environment configuration support (2014-05-27 00:10:55 +0200)

---

Andreas Bießmann (4): corvus: remove unneeded CONFIG_AT91_LEGACY mkimage: add atmelimage arm:at91: enable ROM loadable atmel image sama5d3xek: enable PMECC header generation

Bo Shen (6): ARM: atmel: switch to main crystal osc for SPL boot ARM: atmel: enable SPL on sama5d3_xplained board ARM: atmel: sama5d3xek: convert to generic board ARM: atmel: sama5d3_xplained: convert to generic board ARM: atmel: at91sam9m10g45ek: convert to generic board ARM: atmel: at91sam9x5ek: convert to generic board

David Feng (1): Arm64 fix a bug of vbar_el3 initialization

Ian Campbell (12): sunxi: add sun7i clocks and timer support. sunxi: add sun7i pinmux and gpio support sunxi: add sun7i dram setup support sunxi: add sun7i cpu, board and start of day support sunxi: add support for Cubietruck booting in FEL mode sunxi: add gmac Ethernet support sunxi: mmc support sunxi: non-FEL SPL boot support for sun7i net/designware: ensure device private data is DMA aligned. net/designware: ensure cache invalidations are aligned to ARCH_DMA_MINALIGN net/designware: reorder struct dw_eth_dev to pack more efficiently. net/designware: Make DMA burst length configurable and reduce by default

Michael Walle (2): lsxl: use 64bit for LBA48 to support 4 TB drives lsxl: rework boot scripts

Rob Herring (2): ARM: highbank: convert to generic board boards.cfg: update highbank maintainer email

Stefan Agner (1): arm: vf610: add DDR_SEL_PAD_CONTR register

Wu, Josh (8): gpio: at91: add sanity check for the NULL pointer mmc: atmel_mci: fix print incorrect buffer content for debug ARM: at91: remove AT91X40 macro since it is not use any more ARM: at91sam9x5: define the AT91FAMILY and ARM926EJS in SoC header at91: remove redundant AT91FAMILY definition in board config file ARM: at91: remove redundant ARM926EJS definition in board config files ARM: at91sam9m10g45ek: enable mci0 support ARM: at91sam9m10g45ek: add mmc environment configuration support

Makefile | 10 ++ arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c | 17 ++++ arch/arm/cpu/armv7/Makefile | 2 +- arch/arm/cpu/armv7/at91/config.mk | 10 ++ arch/arm/cpu/armv7/sunxi/Makefile | 25 +++++ arch/arm/cpu/armv7/sunxi/board.c | 111 +++++++++++++++++++++ arch/arm/cpu/armv7/sunxi/clock.c | 25 +++++ arch/arm/cpu/armv7/sunxi/clock_sun4i.c | 188 ++++++++++++++++++++++++++++++++++++ arch/arm/cpu/armv7/sunxi/config.mk | 8 ++ arch/arm/cpu/armv7/sunxi/cpu_info.c | 19 ++++ arch/arm/cpu/armv7/sunxi/dram.c | 593 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/cpu/armv7/sunxi/pinmux.c | 61 ++++++++++++ arch/arm/cpu/armv7/sunxi/start.c | 1 + arch/arm/cpu/armv7/sunxi/timer.c | 113 ++++++++++++++++++++++ arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds | 77 +++++++++++++++ arch/arm/cpu/armv7/sunxi/u-boot-spl.lds | 52 ++++++++++ arch/arm/cpu/armv8/start.S | 4 +- arch/arm/cpu/at91-common/spl.c | 39 ++++++++ arch/arm/include/asm/arch-at91/at91_pmc.h | 4 + arch/arm/include/asm/arch-at91/at91sam9x5.h | 3 + arch/arm/include/asm/arch-at91/hardware.h | 2 - arch/arm/include/asm/arch-sunxi/clock.h | 29 ++++++ arch/arm/include/asm/arch-sunxi/clock_sun4i.h | 256 ++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-sunxi/cpu.h | 122 +++++++++++++++++++++++ arch/arm/include/asm/arch-sunxi/dram.h | 179 ++++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-sunxi/gpio.h | 147 ++++++++++++++++++++++++++++ arch/arm/include/asm/arch-sunxi/mmc.h | 124 ++++++++++++++++++++++++ arch/arm/include/asm/arch-sunxi/spl.h | 20 ++++ arch/arm/include/asm/arch-sunxi/sys_proto.h | 16 +++ arch/arm/include/asm/arch-sunxi/timer.h | 88 +++++++++++++++++ arch/arm/include/asm/arch-vf610/imx-regs.h | 1 + board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 10 ++ board/atmel/sama5d3_xplained/sama5d3_xplained.c | 87 +++++++++++++++++ board/freescale/vf610twr/vf610twr.c | 3 +- board/sunxi/Makefile | 13 +++ board/sunxi/board.c | 120 +++++++++++++++++++++++ board/sunxi/dram_cubietruck.c | 31 ++++++ board/sunxi/gmac.c | 32 ++++++ boards.cfg | 5 +- common/image.c | 1 + doc/README.atmel_pmecc | 21 ++++ drivers/gpio/at91_gpio.c | 3 +- drivers/mmc/Makefile | 1 + drivers/mmc/gen_atmel_mci.c | 5 +- drivers/mmc/sunxi_mmc.c | 503 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/designware.c | 23 +++-- drivers/net/designware.h | 23 +++-- include/configs/at91sam9m10g45ek.h | 37 ++++++- include/configs/at91sam9n12ek.h | 3 - include/configs/at91sam9x5ek.h | 3 +- include/configs/corvus.h | 3 - include/configs/cpu9260.h | 1 - include/configs/ethernut5.h | 2 - include/configs/highbank.h | 1 + include/configs/lsxl.h | 41 ++++++-- include/configs/sama5d3_xplained.h | 53 +++++++++- include/configs/sama5d3xek.h | 4 +- include/configs/sun7i.h | 24 +++++ include/configs/sunxi-common.h | 195 +++++++++++++++++++++++++++++++++++++ include/configs/vl_ma2sc.h | 2 - include/image.h | 1 + include/netdev.h | 1 + spl/Makefile | 24 +++++ tools/.gitignore | 1 + tools/Makefile | 5 + tools/atmel_pmecc_params.c | 51 ++++++++++ tools/atmelimage.c | 342 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/imagetool.c | 2 + tools/imagetool.h | 1 + tools/mksunxiboot.c | 142 +++++++++++++++++++++++++++ 70 files changed, 4112 insertions(+), 54 deletions(-) create mode 100644 arch/arm/cpu/armv7/at91/config.mk create mode 100644 arch/arm/cpu/armv7/sunxi/Makefile create mode 100644 arch/arm/cpu/armv7/sunxi/board.c create mode 100644 arch/arm/cpu/armv7/sunxi/clock.c create mode 100644 arch/arm/cpu/armv7/sunxi/clock_sun4i.c create mode 100644 arch/arm/cpu/armv7/sunxi/config.mk create mode 100644 arch/arm/cpu/armv7/sunxi/cpu_info.c create mode 100644 arch/arm/cpu/armv7/sunxi/dram.c create mode 100644 arch/arm/cpu/armv7/sunxi/pinmux.c create mode 100644 arch/arm/cpu/armv7/sunxi/start.c create mode 100644 arch/arm/cpu/armv7/sunxi/timer.c create mode 100644 arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds create mode 100644 arch/arm/cpu/armv7/sunxi/u-boot-spl.lds create mode 100644 arch/arm/include/asm/arch-sunxi/clock.h create mode 100644 arch/arm/include/asm/arch-sunxi/clock_sun4i.h create mode 100644 arch/arm/include/asm/arch-sunxi/cpu.h create mode 100644 arch/arm/include/asm/arch-sunxi/dram.h create mode 100644 arch/arm/include/asm/arch-sunxi/gpio.h create mode 100644 arch/arm/include/asm/arch-sunxi/mmc.h create mode 100644 arch/arm/include/asm/arch-sunxi/spl.h create mode 100644 arch/arm/include/asm/arch-sunxi/sys_proto.h create mode 100644 arch/arm/include/asm/arch-sunxi/timer.h create mode 100644 board/sunxi/Makefile create mode 100644 board/sunxi/board.c create mode 100644 board/sunxi/dram_cubietruck.c create mode 100644 board/sunxi/gmac.c create mode 100644 drivers/mmc/sunxi_mmc.c create mode 100644 include/configs/sun7i.h create mode 100644 include/configs/sunxi-common.h create mode 100644 tools/atmel_pmecc_params.c create mode 100644 tools/atmelimage.c create mode 100644 tools/mksunxiboot.c

Applied to u-boot/master, thanks!