From patchwork Wed Jan 31 17:27:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Chong X-Patchwork-Id: 126379 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp933838ljc; Wed, 31 Jan 2018 09:28:28 -0800 (PST) X-Google-Smtp-Source: AH8x2279eTYoKswA2Mije5OjtEKv0XX7Uw9UOKfyJciakDDFIoXUnM8iy1eQhB9h+ih1tv0SqNeN X-Received: by 10.55.192.202 with SMTP id v71mr46793176qkv.294.1517419708081; Wed, 31 Jan 2018 09:28:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517419708; cv=none; d=google.com; s=arc-20160816; b=lYenBUnr+NWNKusZyuxsGdN/1SzNP8gmrIaboD3aJuBBI2HZfUKTMEbxqjoKUtA2B6 m0NaCduggOk/vWHz1f5MvXtgmukPpGz+dXR5nqLor55pP9gEy/2pXUmkWhktKTiBVEd/ H7u828cDGxncNHiCrD8Jg+vxBjK9q/tB8J+LL3hNVEE1gXa+dGOsOLW8xvJs9ka3uF8L kEtFUJ6cIQpRRsNrZhwWSakVAi3BhCoiU1pZP83Gp3ETaaYvCs30ncsVfPN/U3ZCxLo+ qqYKklcf+tHetXDPiD0Gxp+DBjXFWgW4NPEtGe5WRrukRRwXzuUFfPL95XxlwAedw07w Z1gA== 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=zcj5g58fbLP/SmMVbdPk3lawzIYKgKB98Wrfp5/aHTI=; b=Am67YHBRinLPMA7L4wFFm0wXhdgtQrzLxKfo3F4Qkpv9Gt35/ckhuf/eqM0XLS6NdZ /nM0t5GqnKj1IBlfC/RKUiehSUyT/Kx42YP/+xpK/ot702rGjs4vZ6q3rsu2ViXzN5cf ZBSkqjYlKke2euxLwLoSiGyTzI5UXyGJHOplJZ9RghyQbRsIgk/cLr1VRu+mGmKNlFF+ o5lu4qUQa7VsPnuWEMag6WHfXSjy1U3UewAtcqh5iwc1yPUqVxWL2KWCza3/MOEgIfhs wplLUhTDKbOYRpTRJKhBxvFM7q4HwsyHrRfPW1iKjMLXXE3sXWzKhw2M36MIX9jvzPI6 lbZg== 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 5si2662075qtn.177.2018.01.31.09.28.27; Wed, 31 Jan 2018 09:28:28 -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 C164F61732; Wed, 31 Jan 2018 17:28:27 +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 ABFF16151A; Wed, 31 Jan 2018 17:28:23 +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 F1A186151A; Wed, 31 Jan 2018 17:28:20 +0000 (UTC) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by lists.linaro.org (Postfix) with ESMTPS id 84733616DA for ; Wed, 31 Jan 2018 17:28:09 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id t94so4351296wrc.5 for ; Wed, 31 Jan 2018 09:28:09 -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=bO/4TTdfuK3098CXLQZwI3hk5A6J/1Zj8SPMV08Z6pI=; b=nBoiodlf2OKX9dW58NFzGX9eXfU5hNhP5I5bThut/jCKTNAtfm+mQrfg1jMkEJzU6B b2V1JvFi4/8Nf8khrODJGVTQygxzFmsNqoZ7cjszcrjAyxQwJKl1C7LUA6gozhcTV4Cs u1a4MTConrTR5/nBfL02C9v706+qxhQLC3lq4VnZBGiDXmHcdPBkI4wmoKWYhS9BIlkQ Icb9Bh4ZC2pwB0vYFo7lTVLV5p6hph9z7wieWoq0Y34N3o5N/7pvj5AcXbCxj4vVSDqM hE2DzCzFep6H12Y8Q8Awx/abebFeslkiG2R+n1UbbylxHYnc+AC9SJ1zItlLDJTpHljP hcyw== X-Gm-Message-State: AKwxytcapIn+/zXoL9ispxFOXfM0juwN62l2uHbAabi3fiWVUExvmxyV t4A8onCaNfTppQmSNpp9KLJOEhuDZ+R6Jw== X-Received: by 10.223.139.11 with SMTP id n11mr8811067wra.91.1517419688701; Wed, 31 Jan 2018 09:28:08 -0800 (PST) Received: from hackbox.linaro.org ([81.128.185.36]) by smtp.gmail.com with ESMTPSA id x135sm208641wmf.35.2018.01.31.09.28.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Jan 2018 09:28:07 -0800 (PST) From: Victor Chong To: leif.lindholm@linaro.org Date: Wed, 31 Jan 2018 17:27:42 +0000 Message-Id: <20180131172743.15875-2-victor.chong@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180131172743.15875-1-victor.chong@linaro.org> References: <20180131172743.15875-1-victor.chong@linaro.org> Cc: Victor Chong , linaro-uefi@lists.linaro.org Subject: [Linaro-uefi] [PATCH 1/2] atf, opteed: Support BL32_EXTRA1 and BL32_EXTRA2 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" Signed-off-by: Victor Chong --- atf-build.sh | 14 ++++++++++++-- opteed-build.sh | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/atf-build.sh b/atf-build.sh index 65d4dbc..21a7645 100755 --- a/atf-build.sh +++ b/atf-build.sh @@ -67,7 +67,7 @@ function build_platform echo "PLATFORM_BUILDFLAGS=$PLATFORM_BUILDFLAGS" fi - unset BL30 BL31 BL32 BL33 + unset BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33 BL30="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o scp_bin`" if [ $ATF_BUILDVER -gt 1 ]; then unset SCP_BL2 @@ -100,9 +100,17 @@ function build_platform SPD="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o atf_spd`" TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`" + TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`" + TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`" if [ X"$TOS_BIN" != X"" ]; then BL32=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN fi + if [ X"$TOS_BIN_EXTRA1" != X"" ]; then + BL32_EXTRA1=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA1 + fi + if [ X"$TOS_BIN_EXTRA2" != X"" ]; then + BL32_EXTRA2=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA2 + fi if [ X"$SPD" != X"" ] && [ X"$BL32" != X"" ]; then # @@ -149,7 +157,7 @@ function build_platform ;; esac - export BL30 BL31 BL32 BL33 + export BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33 echo "BL30=$BL30" if [ $ATF_BUILDVER -gt 1 ] && [ X"$BL30" != X"" ]; then @@ -158,6 +166,8 @@ function build_platform fi echo "BL31=$BL31" echo "BL32=$BL32" + echo "BL32_EXTRA1=$BL32_EXTRA1" + echo "BL32_EXTRA2=$BL32_EXTRA2" echo "BL33=$BL33" echo "$SPD_OPTION" echo "BUILD_TYPE=$BUILD_TYPE" diff --git a/opteed-build.sh b/opteed-build.sh index 702860e..ac9a9cb 100755 --- a/opteed-build.sh +++ b/opteed-build.sh @@ -100,10 +100,14 @@ function build_platform # Copy resulting images to UEFI image dir # TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`" + TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`" + TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`" if [ $VERBOSE -eq 1 ]; then echo "Copying '$TOS_BIN' to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'" fi cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/" + cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA1" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/" + cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA2" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/" else return 1 fi From patchwork Wed Jan 31 17:27: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: 126380 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp934037ljc; Wed, 31 Jan 2018 09:28:43 -0800 (PST) X-Google-Smtp-Source: AH8x226OBCGzqucIskky9s9IIkjWPBJ+chjbgflT+P0L437ZWVGkGG7e3PxLksx3MYgGVN9NL+Oq X-Received: by 10.13.227.198 with SMTP id m189mr23108245ywe.506.1517419723817; Wed, 31 Jan 2018 09:28:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517419723; cv=none; d=google.com; s=arc-20160816; b=Q+xN8/nMEKGWNOo3TfHVe0M9Val7gBhjTo69q2TFcWN+bfWtxbjNt8ZKp84nhAK/qu HXAS7pXEdR2rRy/o1T7F8SY8698WtZZECmXi7VjjTl5LOIoF2FQfTjmizEueXxANYKdD W51FGHPgtQW0FRHA0Xd51c2naKUH0NcphvI/ijd3puNUweYE4ZcYI2PGel8iHjkLRqjW 31Z1wAN8zZ92IXxyPdYpn/l5mz9VrwgS2LkQJI6+0bkKyojKqKSFOTfqtRAIpjcCycxS LKkcGYToV+7tX3KlxROs0WF1xKZln9ga0X6aODhRAUauoDUpJ27hxkVy5LQowBoXECyM kciA== 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=EDodYV2wKUxA5npkYR4aGB7nTml6h0rcOby6mzEgtRw=; b=ui2dmx6EEvy4nTJ6GKv5f6IZgUsg2FQ5qWsU7apO+hTxVaE4Hl9vrQjUbgv58vPDHJ X2lMZjrCny3yFup2/WTYh2pMvRKdYJrCFaYFDfvISjCJFzUnO/8ktAUQME0JSWdPhYdA BJMKCwoD3RWze9lLaURrlizYvkCopsUcVxTKHP4GHZkdGhnN4vTfTt/VZHbUB1tCRLhc BMRMop7W0waVEcpHWikUQ1lDep+WwLyDYlD17Msb/prhCzXhqEBSv94ddKCaKrV/j8Pa rAIx1LtQQa/Nl54LnGyofunH2dyYD4Hci0dLviS1ve1kOHnJS+8Tfrqaou8sGGvldrt2 zEAQ== 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 7si208926qkq.256.2018.01.31.09.28.43; Wed, 31 Jan 2018 09:28:43 -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 7BBAB6151A; Wed, 31 Jan 2018 17:28:43 +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 EFD00616E5; Wed, 31 Jan 2018 17:28:24 +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 DD9706151A; Wed, 31 Jan 2018 17:28:21 +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 76D99616E9 for ; Wed, 31 Jan 2018 17:28:12 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id v31so15868742wrc.11 for ; Wed, 31 Jan 2018 09:28:12 -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=wrBOlsbnfx5RkxCsLRylOdoyqMDlZ/T01Yi0sDsVvK4=; b=VV0ZYpzaz272FzFMRroKBm8O5Esq7DMsBez8F+ZsvwCS5EkYHy3Qemr22iIiVaL/Rs 9W3UlKnEsclu3EL1+NGV2rKWAaHncC1pgxRX0VvDN+rHOtP8VtwidHfWRu5BXoR6UxA6 SzR03xFdBKmVOdfOaV7eZgoJ3fCJeyjYzYU3Qp0KvvTxZ4YXfYpw001lIOC06LwIbJ4z CNC9t1l6JH66HcRJ3YhaZK63ntKCxEmrIxi/DRgCnIOL/0Xm7fo16xIhx/NPdiyLUIjd jRHsM2vSQw5mm1Fh9F/xN3myJu/MbqzNvBoSB9Tq+DuMfwELvyVCsERrj6qSyMsm0Fxk EcgA== X-Gm-Message-State: AKwxytd3iwsJ/N04qXPB1hQfQ2+JwVYldgou2/8n02/Bl44fFcd+5axa rjhTf5xnGuoX0MFT2cgNhWLCsh7o X-Received: by 10.223.132.71 with SMTP id 65mr27482718wrf.142.1517419691637; Wed, 31 Jan 2018 09:28:11 -0800 (PST) Received: from hackbox.linaro.org ([81.128.185.36]) by smtp.gmail.com with ESMTPSA id x135sm208641wmf.35.2018.01.31.09.28.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Jan 2018 09:28:10 -0800 (PST) From: Victor Chong To: leif.lindholm@linaro.org Date: Wed, 31 Jan 2018 17:27:43 +0000 Message-Id: <20180131172743.15875-3-victor.chong@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180131172743.15875-1-victor.chong@linaro.org> References: <20180131172743.15875-1-victor.chong@linaro.org> Cc: Victor Chong , linaro-uefi@lists.linaro.org Subject: [Linaro-uefi] [PATCH 2/2] 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" Signed-off-by: Victor Chong --- platforms.config | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/platforms.config b/platforms.config index e47ba3b..0db2047 100644 --- a/platforms.config +++ b/platforms.config @@ -43,6 +43,8 @@ # $EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/. # To actually build the Trusted OS, you must also set # ATF_SPD. +# - TOS_BIN_EXTRA1 First extra Trusted OS image +# - TOS_BIN_EXTRA2 Second extra Trusted OS image # - ATF_SPD Name of Secure Payload Dispatcher # To actually build the Trusted OS, you must also set # TOS_BIN. @@ -202,7 +204,9 @@ UEFI_BIN=BL33_AP_UEFI.fd UEFI_IMAGE_DIR=HiKey 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_FLAVOR=hikey BUILD_TOS=yes SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey/Binary/mcuimage.bin @@ -221,7 +225,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