u-boot.git/arch/arm/include, branch v2014.04

Merge branch 'u-boot/master' into 'u-boot-arm/master'

2014-04-08T07:25:08Z

Conflicts: arch/arm/cpu/arm926ejs/mxs/Makefile include/configs/trats.h include/configs/trats2.h include/mmc.h

arm64 patch: gicv3 support

2014-04-07T22:15:12Z

This patch add gicv3 support to uboot armv8 platform. Changes for v2: - rename arm/cpu/armv8/gic.S with arm/lib/gic_64.S - move smp_kick_all_cpus() from gic.S to start.S, it would be implementation dependent. - Each core initialize it's own ReDistributor instead of master initializeing all ReDistributors. This is advised by arnab.basu . Signed-off-by: David Feng

arm: vf610: add enet1 support

2014-04-07T18:15:44Z

This patch contains several changes required for second Ethernet (enet1/RMII1) port on vf610 - ANADIG PLL5 control definitions required for Ethernet RMII1 clock - Secondary Ethernet (enet1) MAC RMII1 base address definition - RMII1 iomux definitions - VF610_PAD_PTA6__RMII0_CLKOUT iomux definition required for internal (e.g. crystal-less) Ethernet clocking. Signed-off-by: Marcel Ziswiler [stefan@agner.ch: regrouped patch] Signed-off-by: Stefan Agner

arm: vf610: add uart0 clock/iomux definitions

2014-04-07T18:15:37Z

Add CCM_CCGR0_UART0_CTRL_MASK clock definition and add TX/RX iomux definitions for UART0 (aka. SCI0). Signed-off-by: Marcel Ziswiler [stefan@agner.ch: regrouped patch] Signed-off-by: Stefan Agner

arm: vf610: fix anadig register struct

2014-04-07T18:15:29Z

The anadig_reg structure started at the wrong offset (fixed by adding reserved_0x000[4]), was missing some reserved field required for alignment purpose (reserved_0x094[3] between pll4_denom and pll6_ctrl) and further contained a too short reserved field causing further miss- alignment (reserved_0x0C4[7]). Also, rename all the reserved fields and using a memory offset based scheme for. Discovered and tested by temporarily putting the following debug instrumentation into board_init(): struct anadig_reg *anadig = (struct anadig_reg *)ANADIG_BASE_ADDR; printf("&anadig->pll3_ctrl=0x%p\n", &anadig->pll3_ctrl); printf("&anadig->pll5_ctrl=0x%p\n", &anadig->pll5_ctrl); Signed-off-by: Marcel Ziswiler [stefan@agner.ch: regrouped patch] Signed-off-by: Stefan Agner

armv8/cache: Change cache invalidate and flush function

2014-04-07T15:43:41Z

When SoC first boots up, we should invalidate the cache but not flush it. We can use the same function for invalid and flush mostly, with a wrapper. Invalidating large cache can ben slow on emulator, so we postpone doing so until I-cache is enabled, and before enabling D-cache. Signed-off-by: York Sun CC: David Feng

socfpga: Adding Clock Manager driver

2014-04-07T08:41:50Z

Clock Manager driver will be called to reconfigure all the clocks setting based on user input. The input are passed to Preloader through handoff files Signed-off-by: Chin Liang See Cc: Albert Aribaud Cc: Tom Rini Cc: Wolfgang Denk CC: Pavel Machek Cc: Dinh Nguyen Acked-by: Pavel Machek

cpu: exynos4: add ace sha base address

2014-03-28T19:06:31Z

Signed-off-by: Przemyslaw Marczak Cc: Minkyu Kang

spl: Fix guardian macros in spl.h

2014-03-28T19:06:30Z

Fix the macros guarding the spl.h header for various platforms. Due to a typo and a propagation of it, the macros went out-of-sync with their ifdef check, so fix this. Signed-off-by: Marek Vasut Cc: Tom Rini

Merge branch 'u-boot/master' into 'u-boot-arm/master'

2014-03-25T09:53:15Z

Trivial merge conflict, needed to manually remove local_info as per commit 41364f0f. Conflicts: board/samsung/common/board.c