Tom Rini 0ce033d258 Merge branch 'master' of git://git.denx.de/u-boot-arm ... Albert's rework of the linker scripts conflicted with Simon's making everyone use __bss_end. We also had a minor conflict over README.scrapyard being added to in mainline and enhanced in u-boot-arm/master with proper formatting. Conflicts: arch/arm/cpu/ixp/u-boot.lds arch/arm/cpu/u-boot.lds arch/arm/lib/Makefile board/actux1/u-boot.lds board/actux2/u-boot.lds board/actux3/u-boot.lds board/dvlhost/u-boot.lds board/freescale/mx31ads/u-boot.lds doc/README.scrapyard include/configs/tegra-common.h Build tested for all of ARM and run-time tested on am335x_evm. Signed-off-by: Tom Rini <trini@ti.com>		2013-03-18 14:37:18 -04:00
..
coreboot	x86: Use sections header to obtain link symbols	2013-03-15 16:14:00 -04:00
config.mk	Convert ISO-8859 files to UTF-8	2011-08-04 23:34:02 +02:00
cpu.c	x86: Add basic cache operations	2013-03-04 15:57:34 -08:00
interrupts.c	x86: Permit bootstage and timer data to be used prior to relocation	2013-03-04 15:57:36 -08:00
Makefile	x86: Rename CONFIG_NO_X86_RESET_VECTOR to CONFIG_X86_RESET_VECTOR	2013-02-14 20:18:58 -08:00
resetvec.S	Convert ISO-8859 files to UTF-8	2011-08-04 23:34:02 +02:00
start16.S	x86: Add back cold- and warm-boot flags	2012-12-06 14:30:42 -08:00
start.S	x86: Set up the global data pointer in C instead of asm	2013-02-01 15:36:53 -05:00
timer.c	x86: Add a dummy implementation for timer_get_us	2012-11-30 13:44:05 -08:00
u-boot.lds	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-03-18 14:37:18 -04:00