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
..
.gitignore	smdk6400: add gitignore	2008-08-31 00:39:48 +02:00
config.mk	Handle most LDSCRIPT setting centrally	2011-04-30 00:59:47 +02:00
lowlevel_init.S	Rename TEXT_BASE into CONFIG_SYS_TEXT_BASE	2010-10-18 22:07:10 +02:00
Makefile	punt unused clean/distclean targets	2011-10-15 22:20:36 +02:00
smdk6400_nand_spl.c	Remove board_init_f function from nand_boot.c	2010-11-28 20:21:58 -05:00
smdk6400.c	arm: nvidia and smdk6400: use common code for machine type	2011-09-03 22:40:45 +02:00
u-boot-nand.lds	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-03-18 14:37:18 -04:00