Merge branch 'master' of git://git.denx.de/u-boot-imx

[karo-tx-uboot.git] / nand_spl / nand_boot.c

diff --git a/nand_spl/nand_boot.c b/nand_spl/nand_boot.c
index b9fd6f544c94beac65f6feb0a3f473b383df43a7..4d6db14abe562bb369a7a44c2aae0c2329f3533c 100644 (file)
--- a/nand_spl/nand_boot.c
+++ b/nand_spl/nand_boot.c
@@ -221,6 +221,13 @@ static int nand_load(struct mtd_info *mtd, unsigned int offs,
        return 0;
 }
 
+#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);
+}
+#endif
+
 /*
  * The main entry for NAND booting. It's necessary that SDRAM is already
  * configured and available since this code loads the main U-Boot image