From patchwork Tue Mar 27 16:46:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Chong X-Patchwork-Id: 132487 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp5307112ljb; Tue, 27 Mar 2018 09:47:01 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/SFddLbax5vjXKqyJi+CTTm0xVPi3Altvz/Sf4PjKLaKLQv/DwUwc20SndcCGhNlhV2C8r X-Received: by 2002:a25:5d11:: with SMTP id r17-v6mr66101ybb.444.1522169221820; Tue, 27 Mar 2018 09:47:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522169221; cv=none; d=google.com; s=arc-20160816; b=l8X7TKYBMH3e4q7iLFBz5buZMX9Cw4gl+2EKcJLK0JQ531dJEIx0wyLzxGx7OSHSou v/V4bHhvLq8kO8mxK2n9g8visIce8JvhA/0Sp+vFpSkVFa03WI8mMX6/4vIcs7pxE8LY En2lhzzfQ2pXHzCtqpq/Nvuh1v8Ep+GNmL99nYTwFbK0J2jOVxULeR0A+2UgJShGBBEC kBCdhfOcG/E9LWltQXVrzEkvZH1InoP8+ny4Xh7JFEbFGDZGSo2KC4Mq4Syo8qo/6g7a 33HCrbm/T0DIYqbjaaAd7iZSFqWED5KclHuPikK23NEWalfWjUApcQte271h4fN021+b keqQ== 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:message-id:date:to:from:delivered-to :arc-authentication-results; bh=Sy4tr3CAIGO+28a0wauUCc7FwpcNvI2GgLRnaJ4jqIU=; b=n9uASKyCyUO7XWJlF83g0QqBuj4dJ0SMPX6YEjwv18+fTT/Ek4zXT7erZkOD3Cdz8c w7QrqX8a9i69Q1ssMZxkRyxvN2998THPgN7a0i2ta87TOKsnXXN8cYJFb1/ucQccv6z7 X6S55iCzzpRQQj0g7vkQpf57HDED2wjVAkjQljk6VwaVn3Zlde3xemTHNDqYkDW80BBi 1u3ngiH22cbJYwyg/dsXyUeuZpMkjx9fWE9Fj8jti3jP3P6sXL+NPmGsm/LkdC0zdSOg dmgMmRlJup49y6IdJ/EXV221e8blJBFhU8OE/43iEnSuE/WoRpvoEHp7h+n8BqqvMD0d sVLg== 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 89si1708079qtf.478.2018.03.27.09.47.01; Tue, 27 Mar 2018 09:47:01 -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 C224D62849; Tue, 27 Mar 2018 16:47:00 +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 A16A3617D3; Tue, 27 Mar 2018 16:46:56 +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 81304617D3; Tue, 27 Mar 2018 16:46:54 +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 8D49C614E1 for ; Tue, 27 Mar 2018 16:46:53 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id l49so13937820wrl.4 for ; Tue, 27 Mar 2018 09:46:53 -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; bh=VCrXXj67WUiYLMRWzJYTox+oPzuI0suMwC8IcH9gwvA=; b=Jbt55ZfeeS1i+YQlMBkaVTjq78qO6Z1Yxmm+nvyxea4t/3BOHIU48UKLea5I6dM07s WXthgJnLZd6h1ghRYGdnMtwoQGWLiZD9sOSJoETPfzVBN/HM5aVfQCQ1k840xm+yT3cA yyUI4cBtcVzBmDVtZ6noGfJMAcv9BzMtyloXBxVyKM+0MkHiKcY7NohNvDjIuDVnjcR5 77q4pjxxZA3rry2jntyMyxV6W0TNeLD0/xoc4ZOl49zksdVLlP0se1yFHhi0TxvoJHGn LGeRyW40OJeExZ6h66hjO6jrppuPxDY1SQBZ435q/eiX68vBvIfPSgqu5dRM1VXCGXQG uxcA== X-Gm-Message-State: AElRT7Edp6hIju+yoEv6jhwm0bvTu641hBCLcO9su3t4ViVhzWHrFF+Q IKtX26BfplUkHBbAOxmdeVxhgik9 X-Received: by 10.223.156.198 with SMTP id h6mr61725wre.175.1522169212509; Tue, 27 Mar 2018 09:46:52 -0700 (PDT) Received: from hackbox.linaro.org ([81.128.185.36]) by smtp.gmail.com with ESMTPSA id b8sm1645852wrf.29.2018.03.27.09.46.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Mar 2018 09:46:51 -0700 (PDT) From: Victor Chong To: leif.lindholm@linaro.org Date: Tue, 27 Mar 2018 17:46:22 +0100 Message-Id: <20180327164623.32739-1-victor.chong@linaro.org> X-Mailer: git-send-email 2.16.2 Cc: Victor Chong , linaro-uefi@lists.linaro.org Subject: [Linaro-uefi] [PATCH] atf-build.sh: Fix path to BL32* images 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" Since TOS_BIN* images are not copied to UEFI dir anymore, set path to the BL32 images where they are originally built. Fixes: 0c485dab ("opteed-build.sh: Remove copy of images to UEFI dir") Signed-off-by: Victor Chong Reviewed-by: Fathi Boudra --- atf-build.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) -- 2.16.2 diff --git a/atf-build.sh b/atf-build.sh index fb80ad0..eabfb32 100755 --- a/atf-build.sh +++ b/atf-build.sh @@ -99,17 +99,24 @@ function build_platform if [ X"$TOS_DIR" != X"" ]; then SPD="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o atf_spd`" + TOS_PLATFORM="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_platform`" + if [ X"$TOS_PLATFORM" = X"" ]; then + TOS_PLATFORM="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o atf_platform`" + if [ X"$TOS_PLATFORM" = X"" ]; then + TOS_PLATFORM=$1 + fi + fi 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 + BL32=$TOS_DIR/out/arm-plat-$TOS_PLATFORM/core/$TOS_BIN fi if [ X"$TOS_BIN_EXTRA1" != X"" ]; then - BL32_EXTRA1=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA1 + BL32_EXTRA1=$TOS_DIR/out/arm-plat-$TOS_PLATFORM/core/$TOS_BIN_EXTRA1 fi if [ X"$TOS_BIN_EXTRA2" != X"" ]; then - BL32_EXTRA2=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA2 + BL32_EXTRA2=$TOS_DIR/out/arm-plat-$TOS_PLATFORM/core/$TOS_BIN_EXTRA2 fi if [ X"$SPD" != X"" ] && [ X"$BL32" != X"" ]; then