From 08d177b091be4758c7b541a5f9550b849e6dd092 Mon Sep 17 00:00:00 2001 From: Lin Huang Date: Thu, 10 Mar 2016 16:34:09 +0800 Subject: 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 Original-Commit-Id: ca4e7a50c989ae0eff270df4fa160b80a172af31 Original-Change-Id: Id95d5f282ba49981f8e33da029e8710cd4087945 Original-Signed-off-by: Lin Huang Original-Reviewed-on: https://chromium-review.googlesource.com/332561 Original-Commit-Ready: Vadim Bendebury Original-Tested-by: Vadim Bendebury Original-Reviewed-by: Vadim Bendebury Reviewed-on: https://review.coreboot.org/14719 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/soc/rockchip/rk3399/Kconfig | 1 + src/soc/rockchip/rk3399/Makefile.inc | 1 + 2 files changed, 2 insertions(+) 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 -- cgit v1.2.3