brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-07-18 09:07:59 +09:00
Code Issues Projects Releases Wiki Activity
0ce033d258
u-boot-brain/arch/arm/cpu
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
..
arm720t Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
arm920t Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
arm925t Replace __bss_end__ with __bss_end 2013-03-15 16:13:54 -04:00
arm926ejs Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
arm946es Replace __bss_end__ with __bss_end 2013-03-15 16:13:54 -04:00
arm1136 Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
arm1176 Replace __bss_end__ with __bss_end 2013-03-15 16:13:54 -04:00
arm_intcm Replace __bss_end__ with __bss_end 2013-03-15 16:13:54 -04:00
armv7 Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
ixp Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
pxa Replace __bss_end__ with __bss_end 2013-03-15 16:13:54 -04:00
s3c44b0 Replace __bss_end__ with __bss_end 2013-03-15 16:13:54 -04:00
sa1100 Replace __bss_end__ with __bss_end 2013-03-15 16:13:54 -04:00
tegra20-common tegra: rename FUNCMUX_UART2_UARTB 2013-02-11 10:35:24 -07:00
tegra30-common Tegra30: Cardhu: Add pad config tables/code based on pinmux code 2013-03-14 11:06:43 -07:00
tegra114-common Tegra114: Dalmore: Add pad config tables/code based on pinmux code 2013-03-14 11:49:14 -07:00
tegra-common Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-02-12 10:18:31 -05:00
u-boot-spl.lds Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
u-boot.lds Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00