common/board_f.c: fix condition for reloc_off assignment
authorLothar Waßmann <LW@KARO-electronics.de>
Thu, 16 Jul 2015 11:29:09 +0000 (13:29 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Thu, 16 Jul 2015 11:29:09 +0000 (13:29 +0200)
All ARM systems define the symbol __image_copy_start which is the
correct relocation base address for secure and non-secure boot.

common/board_f.c

index 8e8e217..c172ea1 100644 (file)
@@ -739,7 +739,7 @@ static int reloc_fdt(void)
 static int setup_reloc(void)
 {
 #ifdef CONFIG_SYS_TEXT_BASE
-#ifndef CONFIG_SECURE_BOOT
+#ifndef CONFIG_ARM
        gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE;
 #else
        gd->reloc_off = gd->relocaddr - (unsigned long)__image_copy_start;