Albert ARIBAUD 519fdde9e6 Merge branch 'u-boot/master' into 'u-boot-arm/master' ...

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

2014-04-08 09:25:08 +02:00

..

armada100

arm926ejs: convert makefiles to Kbuild style

2013-10-31 12:53:39 -04:00

at91

at91sam9263ek: add mmc support

2014-03-09 18:24:52 +01:00

davinci

kbuild: change out-of-tree build

2014-02-19 11:07:50 -05:00

kirkwood

arm926ejs: convert makefiles to Kbuild style

2013-10-31 12:53:39 -04:00

lpc32xx

arm926ejs: convert makefiles to Kbuild style

2013-10-31 12:53:39 -04:00

mb86r0x

kbuild: move asm-offsets.c from SoC directory to arch/$(ARCH)/lib

2014-03-28 15:06:29 -04:00

mx25

kbuild: move asm-offsets.c from SoC directory to arch/$(ARCH)/lib

2014-03-28 15:06:29 -04:00

mx27

kbuild: move asm-offsets.c from SoC directory to arch/$(ARCH)/lib

2014-03-28 15:06:29 -04:00

mxs

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

2014-04-08 09:25:08 +02:00

nomadik

arm926ejs: convert makefiles to Kbuild style

2013-10-31 12:53:39 -04:00

omap

Move CONFIG_DISPLAY_CPUINFO to Makefile

2014-02-19 11:10:05 -05:00

orion5x

arm926ejs: convert makefiles to Kbuild style

2013-10-31 12:53:39 -04:00

pantheon

arm926ejs: convert makefiles to Kbuild style

2013-10-31 12:53:39 -04:00

spear

arm: make _end compiler-generated

2014-02-26 21:18:09 +01:00

versatile

ARM: versatile: convert to common timer code

2013-11-04 11:24:22 -05:00

cache.c

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24 09:44:38 -04:00

config.mk

kbuild: refactor more IMX image rules

2014-02-25 11:01:29 -05:00

cpu.c

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24 09:44:38 -04:00

Makefile

arm926ejs: convert makefiles to Kbuild style

2013-10-31 12:53:39 -04:00

start.S

arm: remove unneeded symbol offsets and _TEXT_BASE

2014-02-26 21:18:12 +01:00