]> git.sur5r.net Git - u-boot/commit
projects / u-boot / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1ba91ba) | patch
Rename TEXT_BASE: fix merge conflicts
authorWolfgang Denk <wd@denx.de>
Mon, 18 Oct 2010 21:43:37 +0000 (23:43 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 18 Oct 2010 21:48:15 +0000 (23:48 +0200)
commitc8d76eaf606096eddbe62b8a86545f5116f5189c
treea38043189a96b391d421d83aa875eac662d3f01ftree | snapshot
parent1ba91ba23396005ef7b42381cc21f0baf78d0d60commit | diff
Rename TEXT_BASE: fix merge conflicts

Commit 14d0a02a "Rename TEXT_BASE into CONFIG_SYS_TEXT_BASE" missed a
few places, especially for boards that were added inbetween. Fix the
remaining issues.

Signed-off-by: Wolfgang Denk <wd@denx.de>
board/a4m072/config.mk [deleted file] blob | history
board/eNET/u-boot.lds diff | blob | history
doc/README.arm-relocation diff | blob | history
include/configs/a4m072.h diff | blob | history
nand_spl/nand_boot.c diff | blob | history
nand_spl/nand_boot_fsl_nfc.c diff | blob | history
Cloned from git://git.denx.de/u-boot.git