summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorYork Sun <yorksun@freescale.com>2015-12-07 11:08:58 -0800
committerYork Sun <yorksun@freescale.com>2015-12-15 08:57:33 +0800
commitc04921414c087e15f8fa82d808a25e9338a7e8d5 (patch)
tree440d6c62fb65d6338179268674911168ca297a19 /arch
parentaabd7ddb889aec3c6c4139974f66a44e2ce46ba5 (diff)
downloadtalos-obmc-uboot-c04921414c087e15f8fa82d808a25e9338a7e8d5.tar.gz
talos-obmc-uboot-c04921414c087e15f8fa82d808a25e9338a7e8d5.zip
armv8: fsl-layerscale: Rewrite reserving memory for MC and debug server
MC and debug server are not board-specific. Move reserving memory to SoC file, using the new board_reserve_ram_top function. Reduce debug server memory by 2MB to make room for secure memory. In the system with MC and debug server, the top of u-boot memory is not the end of memory. PRAM is not used for this reservation. Signed-off-by: York Sun <yorksun@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/armv8/fsl-layerscape/cpu.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 87ccaf166f..6ea28ed5cb 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -636,3 +636,24 @@ void reset_cpu(ulong addr)
val |= 0x02;
scfg_out32(rstcr, val);
}
+
+phys_size_t board_reserve_ram_top(phys_size_t ram_size)
+{
+ phys_size_t ram_top = ram_size;
+
+#ifdef CONFIG_SYS_MEM_TOP_HIDE
+#error CONFIG_SYS_MEM_TOP_HIDE not to be used together with this function
+#endif
+/* Carve the Debug Server private DRAM block from the end of DRAM */
+#ifdef CONFIG_FSL_DEBUG_SERVER
+ ram_top -= debug_server_get_dram_block_size();
+#endif
+
+/* Carve the MC private DRAM block from the end of DRAM */
+#ifdef CONFIG_FSL_MC_ENET
+ ram_top -= mc_get_dram_block_size();
+ ram_top &= ~(CONFIG_SYS_MC_RSV_MEM_ALIGN - 1);
+#endif
+
+ return ram_top;
+}
OpenPOWER on IntegriCloud