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

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

2014-04-08T07:25:08+00:00

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:12+00:00

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

bootstage: arm: fix fdt stashing code

2014-04-07T21:03:13+00:00

The conditional is using a variable that is not defined.

Signed-off-by: Rommel G Custodio

ARMv8: fix bug for flush data cache by set/way

2014-04-07T20:27:22+00:00

When flush the d$ with set/way instruction, it need calculate the way's
offset = log2(Associativity); but in current uboot's code, it use below
formula to calculate the offset: log2(Associativity * 2 - 1), so finally
it cannot flush data cache properly.

Signed-off-by: Leo Yan

armv8: Flush dcache before switching to EL2

2014-04-07T20:19:00+00:00

For ARMv8, U-boot has been running at EL3 with cache and MMU enabled.
Without proper setup for EL2, cache and MMU are both disabled (out of
reset). Before switching, we need to flush the dcache to make sure the
data is in the main memory.

Signed-off-by: York Sun 
Acked-by: David.Feng

arm: vf610: add enet1 support

2014-04-07T18:15:44+00:00

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:37+00:00

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:29+00:00

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

build:arm: Remove setting of CROSS_COMPILE environment variable

2014-04-07T18:04:36+00:00

After Kbuild introduction, the CROSS_COMPILE environment variable has been
set to some default value (prefix arm-linux-).

This shall be removed since it breaks building u-boot for native arm target
(like qemu ARM).
Moreover not all compilers have arm-linux- prefix.

Additionally the u-boot cross compiles with CROSS_COMPILE= set explicitly-
e.g.:
CROSS_COMPILE=/ .... /arm-v7a-linux-gnueabi- make

Signed-off-by: Lukasz Majewski 
Cc: Masahiro Yamada 
Acked-by: Masahiro Yamada

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

2014-04-07T17:13:42+00:00