aboutsummaryrefslogtreecommitdiff
path: root/nand_spl/nand_boot_fsl_nfc.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-10-18 23:43:37 +0200
committerWolfgang Denk <wd@denx.de>2010-10-18 23:48:15 +0200
commitc8d76eaf606096eddbe62b8a86545f5116f5189c (patch)
treea38043189a96b391d421d83aa875eac662d3f01f /nand_spl/nand_boot_fsl_nfc.c
parent1ba91ba23396005ef7b42381cc21f0baf78d0d60 (diff)
downloadu-boot-linaro-stable-c8d76eaf606096eddbe62b8a86545f5116f5189c.tar.gz
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>
Diffstat (limited to 'nand_spl/nand_boot_fsl_nfc.c')
-rw-r--r--nand_spl/nand_boot_fsl_nfc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/nand_spl/nand_boot_fsl_nfc.c b/nand_spl/nand_boot_fsl_nfc.c
index 959f16232..21ed3fcff 100644
--- a/nand_spl/nand_boot_fsl_nfc.c
+++ b/nand_spl/nand_boot_fsl_nfc.c
@@ -266,7 +266,8 @@ static int nand_load(unsigned int from, unsigned int size, unsigned char *buf)
#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