Merge branch 'master' of git://git.denx.de/u-boot-arm

Bringing in the MMC tree means that CONFIG_BOUNCE_BUFFER needed to be
added to include/configs/exynos5-dt.h now.

Conflicts:
	include/configs/exynos5250-dt.h

Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Tom Rini
2014-01-10 10:56:00 -05:00
261 changed files with 14936 additions and 6638 deletions

View File

@@ -48,6 +48,10 @@
.globl SYMBOL_NAME(name); \
LENTRY(name)
#define WEAK(name) \
.weak SYMBOL_NAME(name); \
LENTRY(name)
#ifndef END
#define END(name) \
.size name, .-name