dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 09:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename TEXT_BASE: fix merge conflicts

Browse Source 
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>
This commit is contained in:
Wolfgang Denk
2010-10-18 23:43:37 +02:00
parent 1ba91ba233
commit c8d76eaf60
6 changed files with 17 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nand_spl/nand_boot.c
View File

@@ -224,7 +224,8 @@ static int nand_load(struct mtd_info *mtd, unsigned int offs,
#if defined(CONFIG_ARM) && !defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
void board_init_f (ulong bootflag)
{
relocate_code (CONFIG_SYS_TEXT_BASE - TOTAL_MALLOC_LEN, NULL, TEXT_BASE);
relocate_code (CONFIG_SYS_TEXT_BASE - TOTAL_MALLOC_LEN, NULL,
CONFIG_SYS_TEXT_BASE);
}
#endif