summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Huang <hl@rock-chips.com>2016-03-10 16:34:09 +0800
committerPatrick Georgi <pgeorgi@google.com>2016-05-09 08:46:20 +0200
commit08d177b091be4758c7b541a5f9550b849e6dd092 (patch)
treec506ef38329584da3aee52019b15c4732b31f4e3
parent1e80ab341ad93a08b3bce11bcd10f3f9b9d7a6a1 (diff)
rockchip: rk3399: enable arm trust firmware
BRANCH=none BUG=chrome-os-partner:51537 TEST=kernel is not stuck anymore and can boot into prompt, (testing with others patches) Change-Id: I74bdfa0ce608044a554bb3b06ed17b7157260294 Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: ca4e7a50c989ae0eff270df4fa160b80a172af31 Original-Change-Id: Id95d5f282ba49981f8e33da029e8710cd4087945 Original-Signed-off-by: Lin Huang <hl@rock-chips.com> Original-Reviewed-on: https://chromium-review.googlesource.com/332561 Original-Commit-Ready: Vadim Bendebury <vbendeb@chromium.org> Original-Tested-by: Vadim Bendebury <vbendeb@chromium.org> Original-Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: https://review.coreboot.org/14719 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--src/soc/rockchip/rk3399/Kconfig1
-rw-r--r--src/soc/rockchip/rk3399/Makefile.inc1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/soc/rockchip/rk3399/Kconfig b/src/soc/rockchip/rk3399/Kconfig
index 283f6c2c9e..43bb03bd4e 100644
--- a/src/soc/rockchip/rk3399/Kconfig
+++ b/src/soc/rockchip/rk3399/Kconfig
@@ -6,6 +6,7 @@ config SOC_ROCKCHIP_RK3399
select ARCH_ROMSTAGE_ARMV8_64
select ARCH_VERSTAGE_ARMV8_64
select ARM64_A53_ERRATUM_843419
+ select ARM64_USE_ARM_TRUSTED_FIRMWARE
select BOOTBLOCK_CONSOLE
select DRIVERS_UART_8250MEM_32
select GENERIC_UDELAY
diff --git a/src/soc/rockchip/rk3399/Makefile.inc b/src/soc/rockchip/rk3399/Makefile.inc
index 773d87f32e..4b67502a37 100644
--- a/src/soc/rockchip/rk3399/Makefile.inc
+++ b/src/soc/rockchip/rk3399/Makefile.inc
@@ -58,6 +58,7 @@ ramstage-y += ../common/i2c.c
ramstage-y += soc.c
ramstage-y += timer.c
+BL31_MAKEARGS += PLAT=rk3399
################################################################################
CPPFLAGS_common += -Isrc/soc/rockchip/rk3399/include