From patchwork Fri Mar 2 03:49:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Chong X-Patchwork-Id: 130438 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp828599lja; Thu, 1 Mar 2018 19:50:24 -0800 (PST) X-Google-Smtp-Source: AG47ELuEJzE+sXeXqA5Ta25gO/BHxROaAXEFnKFcCqqEdjNmLukddGPFVIgMrxPibVH9rRijF3rQ X-Received: by 10.55.53.139 with SMTP id c133mr6317943qka.229.1519962624500; Thu, 01 Mar 2018 19:50:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519962624; cv=none; d=google.com; s=arc-20160816; b=ycQC6t62S/jRVJCfL96ULOqg+7032oq4qC5O2okkGBXlK3fO49fVu0+csT/qXHjf/r YX918QQBMf9z1ZGiVzQAOCS0zw5Rx+QQvhI/RG/aZkIG2Frbgcca0PNdoJpS8pCUQFzw ATk/YpZ+PsA4z4Uys9+c8ryhqCnuQyd3w+phdAeWhhVweR67Aj6GmtQXQNowdkfN7kOj tbNMSuf90d+Zb65FJ5OUYYljMYTf/VzxXmmjTr0tfCAoRBbXZoAKhI9egcClDTHL6Tqr zXyllaaGoIZfllHB1V3x4TkPXoMFve0SPA9QpsWRrKPS/fwbNM0iQJWXy8/ctIUmbv2P v2pA== 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=SqR4xHyAOEj7ElvUCW3vsNAkHFpISn+1NfnKg31QDc8=; b=a0wM6xuKpoalg4O5AHJPbDIIdDm8cs9RA680sWZZT/Gek8tioYidACwJAGIsFDwui4 D2XHmvRdjBRNddTp0DsrYs4tpqPzZT8ZX3CppW1ILOXmPtSpjaGNT7N/mDHWqqbHcBKP B5iE1KkE45GHIiSV5z07RkCnrQ2UZ0cxKKKce3q6m+K0T2at4xk0Hhz/wuIKFOXdw/Jn oplkWNW/W1Y7e3bsOVZzuEvXGh3KOmAEGk7qukbyBtSyjyTVF0tsvXVV9vzS7G3Ck66v mGvTg0vj1TgUaqy9y+0ovvrG0bWPu8yaFiQYXNSWo/yuEC/xqfq2s1GQ0VPGi/fPMW8d U1cA== 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 s43si774103qta.247.2018.03.01.19.50.24; Thu, 01 Mar 2018 19:50:24 -0800 (PST) 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 3376E617E4; Fri, 2 Mar 2018 03:50:24 +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_H3, RCVD_IN_MSPIKE_WL 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 32016617D0; Fri, 2 Mar 2018 03:50:19 +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 32D94608C1; Fri, 2 Mar 2018 03:50:17 +0000 (UTC) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by lists.linaro.org (Postfix) with ESMTPS id 1FDAE608C1 for ; Fri, 2 Mar 2018 03:50:15 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id q83so652003wme.5 for ; Thu, 01 Mar 2018 19:50:15 -0800 (PST) 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=Ey7uTosT0CspPL4TC3y3XivsAWFjrHFgDQojpEN1Dz8=; b=R8U6yXmOQHk6Cr/4QXp/bctDFBEua/R0RgBmPLCU5pEmJ50unN2D2KAC080zULm0d2 m0K2tAoF5V3LFLJc5vWPrhoVBl8H8xDsDjVh66IYKG/BtKf+IS0NERyuDNvzOOx/a6oO ElD8JdP+jIKWs5WQGs6GGvlmyW6GyotbbwLjrsgB9DWNa0XgRdjdteCTdGPQDT51ehsB /2afYhs9lxGHDG9vlDRpDBobSL3ID4CZ5xVREbaL+oua0KA9mL1ast+dfw4SYJhOZp79 nlXSA3IwVuHsbqh40a+CmF/GczBd6CwCt/BBpXIMLJlGNczgfTCw2BaR6a/XYOMD3pac QtRw== X-Gm-Message-State: AElRT7GrEKdWAEx5FIRAW2XQMJlBtuUuVMZ2YFhQOVuwlFgj7THDYVwj qiPTyloaD/v/B5SF06RfsJGPkpBKptjtxg== X-Received: by 10.28.195.87 with SMTP id t84mr285782wmf.118.1519962614122; Thu, 01 Mar 2018 19:50:14 -0800 (PST) Received: from hackbox.linaro.org ([81.128.185.36]) by smtp.gmail.com with ESMTPSA id e15sm567395wmd.26.2018.03.01.19.50.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Mar 2018 19:50:13 -0800 (PST) From: Victor Chong To: leif.lindholm@linaro.org Date: Fri, 2 Mar 2018 03:49:45 +0000 Message-Id: <20180302034946.30580-3-victor.chong@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180302034946.30580-1-victor.chong@linaro.org> References: <20180302034946.30580-1-victor.chong@linaro.org> Cc: Victor Chong , linaro-uefi@lists.linaro.org Subject: [Linaro-uefi] [PATCH v2 2/3] 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(-) -- 2.15.1 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