summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXing Zheng <zhengxing@rock-chips.com>2016-12-06 17:12:21 +0800
committerPatrick Georgi <pgeorgi@google.com>2017-05-18 23:56:01 +0200
commit53d6d84c3ff33973ca82ed0241cb5967dfc92991 (patch)
treecb2ea342baa8f4f9544702b71e3a5a1f95bef874
parent76b8c0e0444f1003df07ca8dcc77dc0c8854015f (diff)
downloadcoreboot-53d6d84c3ff33973ca82ed0241cb5967dfc92991.tar.xz
rockchip/rk3399: soc: resize reserve memory
Reserve the whole TZRAM area because it will be marked as secure-only by BL31 and can not be accessed by the non-secure kernel. CQ-DEPEND=CL:452659 BUG=chrome-os-partner:57361 BRANCH=firmware-gru-8785.B TEST=the reserve memory is resized Change-Id: Ie3ab39598f3f7cb96feb0c574e230e7fcb53a1a4 Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: f34d254e1dfc9ae95a784aba22503e75a2fa65f1 Original-Change-Id: I39c4cb530f41a7b0f7f3064125072dd85b62276f Original-Signed-off-by: Xing Zheng <zhengxing@rock-chips.com> Original-Reviewed-on: https://chromium-review.googlesource.com/418102 Original-Reviewed-by: Julius Werner <jwerner@chromium.org> Original-(cherry picked from commit ea9fe064a9b1e1ce81fca74f829a0fb6e78ce426) Original-Reviewed-on: https://chromium-review.googlesource.com/452640 Original-Tested-by: Julius Werner <jwerner@chromium.org> Original-Commit-Queue: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/19431 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
-rw-r--r--src/soc/rockchip/rk3399/soc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/soc/rockchip/rk3399/soc.c b/src/soc/rockchip/rk3399/soc.c
index 4418a27a25..37de652983 100644
--- a/src/soc/rockchip/rk3399/soc.c
+++ b/src/soc/rockchip/rk3399/soc.c
@@ -25,6 +25,7 @@
#include <stdlib.h>
#include <string.h>
#include <symbols.h>
+#include <arm-trusted-firmware/plat/rockchip/rk3399/include/shared/bl31_param.h>
static void soc_read_resources(device_t dev)
{
@@ -33,10 +34,11 @@ static void soc_read_resources(device_t dev)
static void soc_init(device_t dev)
{
- /* reserve bl31 image, which define in
- * arm-trusted-firmware/plat/rockchip/rk3399/include/platform_def.h
+ /*
+ * Reserve the whole TZRAM area because it will be marked as secure-only
+ * by BL31 and can not be accessed by the non-secure kernel.
*/
- mmio_resource(dev, 1, (0x10000 / KiB), (0x80000 / KiB));
+ mmio_resource(dev, 1, (TZRAM_BASE / KiB), (TZRAM_SIZE / KiB));
if (IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) && display_init_required())
rk_display_init(dev);