mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-06 17:30:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
u-boot-2016/board/amcc
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
..
acadia Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
bamboo Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
bluestone punt unused clean/distclean targets 2011-10-15 22:20:36 +02:00
bubinga punt unused clean/distclean targets 2011-10-15 22:20:36 +02:00
canyonlands Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
common board/amcc/common/flash.c: Fix GCC 4.6 build warning 2011-12-05 23:17:41 +01:00
ebony doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
katmai punt unused clean/distclean targets 2011-10-15 22:20:36 +02:00
kilauea Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
luan punt unused clean/distclean targets 2011-10-15 22:20:36 +02:00
makalu punt unused clean/distclean targets 2011-10-15 22:20:36 +02:00
ocotea doc: cleanup - move board READMEs into respective board directories 2012-07-29 15:42:02 +02:00
redwood punt unused clean/distclean targets 2011-10-15 22:20:36 +02:00
sequoia Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
taihu board/amcc/taihu/flash.c: Fix GCC 4.6 build warnings 2011-12-05 23:17:53 +01:00
taishan consolidate mdelay by providing a common function for all users 2011-10-22 01:16:08 +02:00
walnut punt unused clean/distclean targets 2011-10-15 22:20:36 +02:00
yosemite punt unused clean/distclean targets 2011-10-15 22:20:36 +02:00
yucca board/amcc/yucca/flash.c: Fix GCC 4.6 build warnings 2011-12-05 23:17:47 +01:00