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>
No related branches found
No related tags found
Showing
- .gitignore 0 additions, 1 deletion.gitignore
- MAINTAINERS 11 additions, 0 deletionsMAINTAINERS
- Makefile 5 additions, 12 deletionsMakefile
- README 29 additions, 0 deletionsREADME
- arch/arm/cpu/arm1136/mx35/generic.c 1 addition, 1 deletionarch/arm/cpu/arm1136/mx35/generic.c
- arch/arm/cpu/arm720t/tegra114/cpu.c 33 additions, 4 deletionsarch/arm/cpu/arm720t/tegra114/cpu.c
- arch/arm/cpu/arm920t/ep93xx/u-boot.lds 1 addition, 1 deletionarch/arm/cpu/arm920t/ep93xx/u-boot.lds
- arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c 15 additions, 15 deletionsarch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c
- arch/arm/cpu/arm926ejs/config.mk 1 addition, 1 deletionarch/arm/cpu/arm926ejs/config.mk
- arch/arm/cpu/arm926ejs/mxs/clock.c 2 additions, 1 deletionarch/arm/cpu/arm926ejs/mxs/clock.c
- arch/arm/cpu/arm926ejs/mxs/mxs_init.h 1 addition, 1 deletionarch/arm/cpu/arm926ejs/mxs/mxs_init.h
- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c 14 additions, 2 deletionsarch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
- arch/arm/cpu/arm926ejs/mxs/spl_power_init.c 1 addition, 1 deletionarch/arm/cpu/arm926ejs/mxs/spl_power_init.c
- arch/arm/cpu/arm926ejs/mxs/timer.c 29 additions, 10 deletionsarch/arm/cpu/arm926ejs/mxs/timer.c
- arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds 0 additions, 6 deletionsarch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds
- arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds 0 additions, 6 deletionsarch/arm/cpu/arm926ejs/spear/u-boot-spl.lds
- arch/arm/cpu/armv7/Makefile 1 addition, 1 deletionarch/arm/cpu/armv7/Makefile
- arch/arm/cpu/armv7/am33xx/board.c 2 additions, 2 deletionsarch/arm/cpu/armv7/am33xx/board.c
- arch/arm/cpu/armv7/am33xx/ddr.c 9 additions, 3 deletionsarch/arm/cpu/armv7/am33xx/ddr.c
- arch/arm/cpu/armv7/am33xx/u-boot-spl.lds 67 additions, 0 deletionsarch/arm/cpu/armv7/am33xx/u-boot-spl.lds
Loading
Please register or sign in to comment