summaryrefslogtreecommitdiff
path: root/common/board_f.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-07-19 16:38:57 -0400
committerTom Rini <trini@konsulko.com>2016-07-19 16:38:57 -0400
commit66669fcf809c1e3ff644b12e04e625d3737ffd8e (patch)
tree362111f12b9dcf33eb31e165d882957df45fc896 /common/board_f.c
parentf60d0603edca472c4458b30956f38c6c1a836d66 (diff)
parent0e68a3694d1f33c69be7d1cec5a4261aa1d3d01d (diff)
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: arch/arm/cpu/armv8/Makefile arch/arm/lib/bootm-fdt.c
Diffstat (limited to 'common/board_f.c')
-rw-r--r--common/board_f.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/common/board_f.c b/common/board_f.c
index 8d936cc0b7b..c4501affd9d 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -340,7 +340,7 @@ static int setup_dest_addr(void)
* Record secure memory location. Need recalcuate if memory splits
* into banks, or the ram base is not zero.
*/
- gd->secure_ram = gd->ram_size;
+ gd->arch.secure_ram = gd->ram_size;
#endif
/*
* Subtract specified amount of memory to hide so that it won't
@@ -433,6 +433,15 @@ static int reserve_mmu(void)
gd->arch.tlb_addr = gd->relocaddr;
debug("TLB table from %08lx to %08lx\n", gd->arch.tlb_addr,
gd->arch.tlb_addr + gd->arch.tlb_size);
+
+#ifdef CONFIG_SYS_MEM_RESERVE_SECURE
+ /*
+ * Record allocated tlb_addr in case gd->tlb_addr to be overwritten
+ * with location within secure ram.
+ */
+ gd->arch.tlb_allocated = gd->arch.tlb_addr;
+#endif
+
return 0;
}
#endif