From patchwork Mon Mar 19 06:42:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Chong X-Patchwork-Id: 132016 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp2371213ljb; Sun, 18 Mar 2018 23:44:07 -0700 (PDT) X-Google-Smtp-Source: AG47ELuTaOt4N8OTC4M8t15cksQqMlVU85783Kb/udH0fNvm1iPiQ3f5AjjoEtHy4d9Eu/TZl4oE X-Received: by 10.55.188.196 with SMTP id m187mr5389826qkf.71.1521441847489; Sun, 18 Mar 2018 23:44:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521441847; cv=none; d=google.com; s=arc-20160816; b=mu3MloDwvU34YAsQ47DeozN+reCP/Wz0Les7kYRPL7Q8tpxSlfhaakcTCtvaOKxXVq UCEWZwhpRULr/m6p80l9E6wR7k3WuNnt7TB6UhNw2QeU/atPUy9qiccDgsq1fYKlvaGm 7MoFkCizUQ2I0tvjp1Wvvv/PlKDRzyLF52/sqe4FjHe9Qc6Xmg1atW5EAar83LGz84+T DmvE5EyzQ/S2kQOXF7/sFa6+kIHnMRNfgvUmBXUw2O3f1bedkztYOz7N1KdShSoxnFF/ /Olq/K1tqHp7CaNhZ28loUGlbPkd1SneX7fE0ztJjzEuMcds02JAvZL7M7S7Af4RWSmw GflQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=T16DeITMEI3YJyShsdBoSIsHEyaP5vW8IM+7xR569/4=; b=PHZ0cjL9LCTxrQUD+GF/F+E54WGnQZ5IZJgoRagI31MoVPDgUeYCZn0/Stv+tUl4hL qFwqgduPRGO1ziKG51g6xOq1z/ZWNBlVX1ZP5GQId45APybFHlxQ8m62dW59Hw89up4Y /f385/gvPtDt6IYuxDSGK52mjS5cKlMzaKtm3w4lcydJWcBgugbuqbeJ8vuFy8MSXum9 SW82+5xf2aQDh3wNNFxPOB1z9IclXMHRQt2MObP0D7ENm6xXGTdhD2CslljGgNzebi2r Hz7sBTd+JYFoBm+9FYdDEdhkWMuWNg0o3k9op67tuM3a0qT1FVSRsyIKZ+dbo3R9jweK z9Cw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id q2si11097846qke.278.2018.03.18.23.44.07; Sun, 18 Mar 2018 23:44:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 1E536642AE; Mon, 19 Mar 2018 06:44:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2 autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id CDE7A642B1; Mon, 19 Mar 2018 06:43:42 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 9E95B642AE; Mon, 19 Mar 2018 06:43:37 +0000 (UTC) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by lists.linaro.org (Postfix) with ESMTPS id 887C3642B2 for ; Mon, 19 Mar 2018 06:43:30 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id n12so17383451wra.2 for ; Sun, 18 Mar 2018 23:43:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gZ7iDt3PlY4WBsEeYPQrPqKlszdSIRVlC2us8FgoLDc=; b=R+h8QxNazTxDm6KtfXmrKLWcA41vogyB0vHVaGVOJU6vJCB0ik2+G+3/zlKTpUAgn8 tMkLH7Jun0y4N3B9QIaaw/E43/TaE1EF3wPpbX7GCZ2RWb8ibEGnwGDco90M/peZBY/v adoD6hJJ8lPO3oUsIAzY9zYCNn/RW9IDsPdT/6B0GO590pLLCW0JEosG4RZzPOQA+3Ho FM9Lxj3BxUEgEdNjQb4KqmmeP4jLzGz+MmAm2bXuFGNegXKIJ8hRODfsDmwVyr54KKKQ NMnD/VcT5pR72fJMIly1o+nw0Oq7vjIuYWiXHP7px061PiakgJmdi0gcK3trjoGY+lRR vCjQ== X-Gm-Message-State: AElRT7F2AJ2GPgp14Zunfr/uTYVm+ERzMOsPt5sLRzitTozij/xS/bdT XySp7k4WMCLZzOqTLNk1gm+2u1IB X-Received: by 10.223.173.72 with SMTP id p66mr8265383wrc.191.1521441809714; Sun, 18 Mar 2018 23:43:29 -0700 (PDT) Received: from hackbox.linaro.org ([81.128.185.36]) by smtp.gmail.com with ESMTPSA id m191sm12558091wma.21.2018.03.18.23.43.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 18 Mar 2018 23:43:28 -0700 (PDT) From: Victor Chong To: leif.lindholm@linaro.org Date: Mon, 19 Mar 2018 06:42:43 +0000 Message-Id: <20180319064244.24344-5-victor.chong@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319064244.24344-1-victor.chong@linaro.org> References: <20180319064244.24344-1-victor.chong@linaro.org> Cc: Victor Chong , linaro-uefi@lists.linaro.org Subject: [Linaro-uefi] [PATCH 4/5] edk2-platforms.config: hikey*: Set TOS_BIN_EXTRA{1, 2} X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "For discussions about Linaro-related UEFI development. Not a substitute for edk2-devel." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" Previously, we were using a 'headless' version of optee_os binary for hikey and hikey960. With BL32_EXTRA1 and BL32_EXTRA2, we now enable optee_os header parsing to allow dynamic runtime support of either a 64- or 32-bit optee_os builds, and also the pager feature. Signed-off-by: Victor Chong --- edk2-platforms.config | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/edk2-platforms.config b/edk2-platforms.config index 15c68c8..8d63ed1 100644 --- a/edk2-platforms.config +++ b/edk2-platforms.config @@ -39,6 +39,8 @@ # different from UEFI platform name. # - SCP_BIN SCP image to pass to ARM Trusted Firmware. # - TOS_BIN Trusted OS image to pass to ARM Trusted Firmware. +# - TOS_BIN_EXTRA1 First extra Trusted OS image +# - TOS_BIN_EXTRA2 Second extra Trusted OS image # The path is relative to # $EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/. # To actually build the Trusted OS, you must also set @@ -111,7 +113,9 @@ UEFI_BIN=BL33_AP_UEFI.fd UEFI_IMAGE_DIR=HiKey SCP_BIN=Platform/Hisilicon/HiKey/mcuimage.bin ATF_SPD=opteed -TOS_BIN=tee-pager.bin +TOS_BIN=tee-header_v2.bin +TOS_BIN_EXTRA1=tee-pager_v2.bin +TOS_BIN_EXTRA2=tee-pageable_v2.bin TOS_PLATFORM_FLAVOR=hikey BUILD_TOS=yes # Uncomment this to use UART0 as the EDK2 console @@ -129,7 +133,9 @@ UEFI_BIN=BL33_AP_UEFI.fd UEFI_IMAGE_DIR=HiKey960 BUILD_ATF=yes ATF_SPD=opteed -TOS_BIN=tee-pager.bin +TOS_BIN=tee-header_v2.bin +TOS_BIN_EXTRA1=tee-pager_v2.bin +TOS_BIN_EXTRA2=tee-pageable_v2.bin TOS_PLATFORM=hikey TOS_PLATFORM_FLAVOR=hikey960 BUILD_TOS=yes