Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-05 20:54:31 +00:00
Code Issues Projects Releases Packages Wiki Activity
u-boot/board/matrix_vision
History
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
..
common bootstage: Replace show_boot_progress/error() with bootstage_...() 2012-03-18 21:41:39 +01:00
mergerbox doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
mvbc_p doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
mvblm7 doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
mvblx omap_hsmmc: add driver check for write protection 2013-03-08 16:41:13 -05:00
mvsmr Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00