From patchwork Mon Mar 19 06:42: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: 132018 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp2371588ljb; Sun, 18 Mar 2018 23:44:37 -0700 (PDT) X-Google-Smtp-Source: AG47ELtyV1yPouu322y1YeqjtufoplaHbOAJ3eKwAEsFYoDVYj/yCf/5Ka8/ZUBX274OFtyYJ/i0 X-Received: by 10.200.112.19 with SMTP id x19mr16706822qtm.85.1521441877352; Sun, 18 Mar 2018 23:44:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521441877; cv=none; d=google.com; s=arc-20160816; b=1EU2hvJzc55YvmwbkMRCA6yxBL/ApFwtfgKeQMuy23qWGUf61bPqGiJuWhMJ0ErvAv anLVHWRnNaarw/RlQKRvjOOQZkF7No7msjIT1uTvA6F5erlb5VGaQGNURHH3R5cT6ATT 7q1o+WD/LfbD/jGkY88mez8tiYgHsy9LTG9YUNenZ0n0CWtO4j6KFp1T48iwuUwbyk6I IuS9t/em+neLJ73mR16xJ6xVeTsZf873ACUJ5BB93Nn8ilTmFSIXS51aL4IbqpCXWebB DkgPV95tqXDBsALhnK5O/aNBo8An11Ms4diDsfr1rGCd7k40zhRGxyUyB59lu8iy6S3G H0AA== 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=607RhRyEGqIlcNCfq/ta+owCOJcfrf5z/EG4sbGGurk=; b=ZruSVShr695A+CMeqKzlrwiEXcmlbdbM35QPV4+i49S9xkkPn9JbBizMyyALAAzUVW PrhNAWl6Z3MrdnvZTbut7mAoJzfr1L7i6Z4KjsBX/8zUumXN8DN+qcoBsQZ0KHjVGlFp Dd+jBfB9p8sht6HYeQgB3fiHMMk9F5UQb8xm82OiObfbmYpyYpI8+hEOGD8micUIntoI Fzezb4WdUkV219KbmDdeGfpLdE/So0zZRwaNELtp+g/p2FO8lUqgjm+L6c0vD+a3obcL Cl5x6EEGutuH/n65vbEGOZQaIVOIxZqkqmW0a0k6/ld62vPo3+WGkZLb+tbSY2Kum60r bv8g== 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 a14si238822qtj.478.2018.03.18.23.44.37; Sun, 18 Mar 2018 23:44:37 -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 06135642B4; Mon, 19 Mar 2018 06:44:37 +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 286BD642BB; Mon, 19 Mar 2018 06:43:46 +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 F2095642B0; Mon, 19 Mar 2018 06:43:37 +0000 (UTC) Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by lists.linaro.org (Postfix) with ESMTPS id 34503642B1 for ; Mon, 19 Mar 2018 06:43:29 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id o8so17402875wra.1 for ; Sun, 18 Mar 2018 23:43:29 -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=cWorO9NPSAYR8WcShE/wZbEc1ndKWme8+pYjjX0kZhw=; b=BqbBxfz/0/qlMPuQ8mWix2F47WRAbySYw1uGjFPQhFc4nIKVyUx7VQUk3WBWlLuc5o EmJ3EchjXTibQ+nDaihhR4DBYn5Jbcfp0wGeISgHXfVkhEXuLoSF4UIE6RYoZbUJAfAp 8honZ85OT78tSkP+NNx/QuED+hBdgEga0d3wAB5H/PjlCw1mSy7vOgX1YAf2JryccLpY x/fmr3j29WowWRgERO+B8OuroqJNrAUhNuDCaP6gaqnXSOC/cUxyOkS+A1nIZ98uR8Xs QM7XZCsm8WKBspwuwW4FEALUDeU/R5p29PAigbjJtg5eOZvXov+ujnGgBKhMqrnLhWAD rl8Q== X-Gm-Message-State: AElRT7Fs3bXGNRS+VzsSwY2Jps+Ha4RHkCy1ISdqLdEy+pWNQh1PIjTB UIGcO+bxg72GSelodYtzYqe4HEiD X-Received: by 10.223.200.138 with SMTP id k10mr4707080wrh.282.1521441808313; Sun, 18 Mar 2018 23:43:28 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 18 Mar 2018 23:43:27 -0700 (PDT) From: Victor Chong To: leif.lindholm@linaro.org Date: Mon, 19 Mar 2018 06:42:42 +0000 Message-Id: <20180319064244.24344-4-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 3/5] 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" 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 --- atf-build.sh | 14 ++++++++++++-- opteed-build.sh | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/atf-build.sh b/atf-build.sh index 5e03569..fb80ad0 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 be16913..40fb844 100755 --- a/opteed-build.sh +++ b/opteed-build.sh @@ -103,6 +103,8 @@ 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`" else return 1 fi