mirror of
https://github.com/u-boot/u-boot.git
synced 2024-11-26 21:54:37 +08:00
0ce033d258
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> |
||
|---|---|---|
| .. | ||
| armada100 | ||
| at91 | ||
| davinci | ||
| kirkwood | ||
| lpc32xx | ||
| mb86r0x | ||
| mx25 | ||
| mx27 | ||
| mxs | ||
| nomadik | ||
| omap | ||
| orion5x | ||
| pantheon | ||
| spear | ||
| versatile | ||
| cache.c | ||
| config.mk | ||
| cpu.c | ||
| Makefile | ||
| start.S | ||