From patchwork Mon Dec 5 16:12:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 86585 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp1559315qgi; Mon, 5 Dec 2016 08:12:44 -0800 (PST) X-Received: by 10.55.27.40 with SMTP id b40mr50289642qkb.256.1480954364222; Mon, 05 Dec 2016 08:12:44 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id e5si9205148qtc.144.2016.12.05.08.12.43; Mon, 05 Dec 2016 08:12:44 -0800 (PST) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 63EDB60976; Mon, 5 Dec 2016 16:12: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 4DD4F60670; Mon, 5 Dec 2016 16:12:39 +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 7A38660698; Mon, 5 Dec 2016 16:12:37 +0000 (UTC) Received: from mail-wj0-f172.google.com (mail-wj0-f172.google.com [209.85.210.172]) by lists.linaro.org (Postfix) with ESMTPS id 7A2856066C for ; Mon, 5 Dec 2016 16:12:33 +0000 (UTC) Received: by mail-wj0-f172.google.com with SMTP id qp4so295015357wjc.3 for ; Mon, 05 Dec 2016 08:12:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=t67tvrZVdQ7G6Sjaz5jzeAUS3EKKp/a2LAQxpdpB7fg=; b=TuKuz9XIpkRg9dc/gkLskX0Z8tJls+t8oJXVIFl8mKz4Xn6KyNQUoRbKacAaJbuiuO sc4QhOI6EwLSL7jfnnXy0b+7mJ9jeh+natY5h3Eu1f2VJNXPLbAxEUBLxivkoSTa63c5 zjzlHuOzpT4zn0csrQZf/M0g582Jq2aHZQg94hcXBA9Dt1wYYMPQpi60Ww4cACqkzVep 1Wwar5YSA6Fas+DVzEs5i74f8LNtpDz8INlosljOh7akYt4hGYJs0xDOk8FGWf/wMIQ7 Wq3or+zokH2xpf22RODs9wuG1w3eCttriKFPC9Zzlc3+Ej5UzI6ymj/okVEizoO/NdLP jjvw== X-Gm-Message-State: AKaTC01nX1tnUCq2hgi2lrKTyfVgTmnXG7h4Ux6OhPWlEgBjQ7200RyKyOpVctKjYkfLLNxsDJY= X-Received: by 10.194.123.201 with SMTP id mc9mr61593172wjb.47.1480954352533; Mon, 05 Dec 2016 08:12:32 -0800 (PST) Received: from localhost.localdomain ([105.144.52.243]) by smtp.gmail.com with ESMTPSA id 81sm853430wmw.7.2016.12.05.08.12.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Dec 2016 08:12:31 -0800 (PST) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org, leif.lindholm@linaro.org Date: Mon, 5 Dec 2016 16:12:20 +0000 Message-Id: <1480954340-6487-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 Subject: [Linaro-uefi] [PATCH] Platforms/AMD/Styx: fix broken build due to iasl command line change X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: 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" The upstream BaseTools where modified to allow the use of PCDs in ASL source code, but this requires the -P option to be removed from the iasl command line. The Styx platforms need ARCHCC_FLAGS on the iasl command line, but since we use the single, additive '=', there is no need to duplicate the other options, and we can safely remove them. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 4 ++-- Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc | 4 ++-- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index e668b6b06d13..f833fe200422 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -254,8 +254,8 @@ DEFINE DO_KCS = 0 GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG *_*_*_ASL_FLAGS = -tc -li -l -so - *_*_*_ASLPP_FLAGS = -x c -E -P $(ARCHCC_FLAGS) - *_*_*_ASLCC_FLAGS = -x c $(ARCHCC_FLAGS) + *_*_*_ASLPP_FLAGS = $(ARCHCC_FLAGS) + *_*_*_ASLCC_FLAGS = $(ARCHCC_FLAGS) GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64 GCC:*_*_AARCH64_PP_FLAGS = -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64 diff --git a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc index 5fd6d841072d..107205386c55 100644 --- a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc +++ b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc @@ -259,8 +259,8 @@ DEFINE DO_KCS = 1 GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG *_*_*_ASL_FLAGS = -tc -li -l -so - *_*_*_ASLPP_FLAGS = -x c -E -P $(ARCHCC_FLAGS) - *_*_*_ASLCC_FLAGS = -x c $(ARCHCC_FLAGS) + *_*_*_ASLPP_FLAGS = $(ARCHCC_FLAGS) + *_*_*_ASLCC_FLAGS = $(ARCHCC_FLAGS) GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64 GCC:*_*_AARCH64_PP_FLAGS = -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64 diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index 70b94df7d6da..92721064a51f 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -261,8 +261,8 @@ DEFINE DO_KCS = 1 GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG *_*_*_ASL_FLAGS = -tc -li -l -so - *_*_*_ASLPP_FLAGS = -x c -E -P $(ARCHCC_FLAGS) - *_*_*_ASLCC_FLAGS = -x c $(ARCHCC_FLAGS) + *_*_*_ASLPP_FLAGS = $(ARCHCC_FLAGS) + *_*_*_ASLCC_FLAGS = $(ARCHCC_FLAGS) GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_XGBE=$(DO_XGBE) -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64 GCC:*_*_AARCH64_PP_FLAGS = -DDO_XGBE=$(DO_XGBE) -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64