From a384c2899d5440a216eadbb6a144ba7d49e3674e Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Thu, 28 May 2015 12:13:51 -0700 Subject: arm64: Add support for loading secure os Add support for loading secure os and pass its entrypoint as bl32 params to bl31 stage. BUG=chrome-os-partner:40713 BRANCH=None TEST=Compiles successfully and loads secure os Change-Id: I1409ccb7344c1d1b1ddc2b321fdae1beea2f823d Signed-off-by: Patrick Georgi Original-Commit-Id: d3dc19025ff11c1e0590306230df7654ef9ad086 Original-Change-Id: Iafd540bf2906d10b5ee009e96179121fecbf5e11 Original-Signed-off-by: Furquan Shaikh Original-Reviewed-on: https://chromium-review.googlesource.com/273719 Original-Reviewed-by: Julius Werner Original-Commit-Queue: Furquan Shaikh Original-Trybot-Ready: Furquan Shaikh Original-Tested-by: Furquan Shaikh Reviewed-on: http://review.coreboot.org/10693 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/arch/arm64/Makefile.inc | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/arch/arm64/Makefile.inc') diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc index 1aeef7654c..86d6f7dce6 100644 --- a/src/arch/arm64/Makefile.inc +++ b/src/arch/arm64/Makefile.inc @@ -217,6 +217,16 @@ $(BL31_CBFS)-type := stage $(BL31_CBFS)-compression := $(CBFS_COMPRESS_FLAG) cbfs-files-y += $(BL31_CBFS) +ifeq ($(CONFIG_ARM64_USE_SECURE_OS),y) + +SECURE_OS_FILE := $(CONFIG_ARM64_SECURE_OS_FILE) +SECURE_OS_FILE_CBFS := $(call strip_quotes,$(CONFIG_CBFS_PREFIX))/secure_os +$(SECURE_OS_FILE_CBFS)-file := $(SECURE_OS_FILE) +$(SECURE_OS_FILE_CBFS)-type := stage +cbfs-files-y += $(SECURE_OS_FILE_CBFS) + +endif # CONFIG_ARM64_USE_SECURE_OS + endif # CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE endif # CONFIG_ARCH_RAMSTAGE_ARM64 -- cgit v1.2.3