projects
/
karo-tx-uboot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
46eeb14
)
common/board_f.c: fix condition for reloc_off assignment
author
Lothar Waßmann
<LW@KARO-electronics.de>
Wed, 19 Aug 2015 11:25:53 +0000
(13:25 +0200)
committer
Lothar Waßmann
<LW@KARO-electronics.de>
Wed, 19 Aug 2015 11:25:53 +0000
(13:25 +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
patch
|
blob
|
history
diff --git
a/common/board_f.c
b/common/board_f.c
index
8e8e217
..
c172ea1
100644
(file)
--- a/
common/board_f.c
+++ b/
common/board_f.c
@@
-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;