From patchwork Tue Jul 12 11:18:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 71818 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp416741qga; Tue, 12 Jul 2016 04:19:09 -0700 (PDT) X-Received: by 10.66.94.71 with SMTP id da7mr2954941pab.31.1468322349048; Tue, 12 Jul 2016 04:19:09 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id b1si2086098pfk.262.2016.07.12.04.19.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jul 2016 04:19:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 58D7A1A1E95; Tue, 12 Jul 2016 04:19:53 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x22c.google.com (mail-wm0-x22c.google.com [IPv6:2a00:1450:400c:c09::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0A6821A1E8C for ; Tue, 12 Jul 2016 04:19:52 -0700 (PDT) Received: by mail-wm0-x22c.google.com with SMTP id i5so20930835wmg.0 for ; Tue, 12 Jul 2016 04:19:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=02TiIUYPiIbVNS4Hz2yKOdqj5iQNWkaSPrAhmC5eGmU=; b=UdYRTqBJB/HN+OvaOk2m/rWZKnaVcMNCw77M7Mci6L3q6IbUiYEZ+I3VzW/1OyZc+/ sCSXlQqOkBJC3lva2gpnsHLAb062Mk7M6evRn4DBN5etj4CrUIaTZLNGCETjca0Rv8Ec 6dxaIwnUdTnajYEtjFk7KM2HlguaYGZqYAvpk= 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:in-reply-to :references; bh=02TiIUYPiIbVNS4Hz2yKOdqj5iQNWkaSPrAhmC5eGmU=; b=j9NQxIdATVc9qKDIG+9Wvhv3Mp/DHIqmHZC9ak5q5XdggSfYJSN9aAKQfhqxjEt6bV dEcdobTbE8jKzdzYsegQnmPb3N1QBEgbQfhUxYtPMrcjyhoZsCOx/SKBJewLJup168/s /drtaj6bURZGPAefvrlFmAjlGjiEqdTu6UmrutiU+RIoEU2sARuEmOBdQCxE1xPJw2wh KqTkOnkvpJr/smxrD8tqdhDA+b+hjN/TtOgCp8KO2dSk5/7ubDC4Ss9oOtZqOFfcy2MC 8S5IhIXNdsTu4EYtIZD1NmRNpWRyoNRZGuNyKSU/MWHjzW43HYjz1qheJr8RyN/wxFym FmWw== X-Gm-Message-State: ALyK8tLNrf7JEjmxFwUVVnkiodyEMaD+zAo4N8UBrDW6Sbm80oxlRs0BqvdzlI3ytkqVUtV7 X-Received: by 10.28.138.18 with SMTP id m18mr20360494wmd.63.1468322345584; Tue, 12 Jul 2016 04:19:05 -0700 (PDT) Received: from localhost.localdomain ([188.203.148.129]) by smtp.gmail.com with ESMTPSA id q187sm6580267wma.17.2016.07.12.04.19.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Jul 2016 04:19:04 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, lersek@redhat.com Date: Tue, 12 Jul 2016 13:18:58 +0200 Message-Id: <1468322342-30611-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468322342-30611-1-git-send-email-ard.biesheuvel@linaro.org> References: <1468322342-30611-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v2 1/5] ArmVirtPkg: ArmVirtQemuKernel: make ACPI support AARCH64 only X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The reasoning of patch 8e2efec6b206: No ARM support for ACPI is planned under any OS we intend to run under ArmVirtQemu-ARM, so remove the drivers from the ARM build. applies equally to ArmVirtQemuKernel, so apply the same change there. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtQemuKernel.dsc | 19 ++++++++++--------- ArmVirtPkg/ArmVirtQemuKernel.fdf | 2 ++ 2 files changed, 12 insertions(+), 9 deletions(-) -- 1.9.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Laszlo Ersek diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 379ccaae6a81..6bf894a5702f 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -340,15 +340,6 @@ [Components.common] OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf # - # ACPI Support - # - MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf - OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf { - - NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf - } - - # # PCI support # ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf @@ -376,3 +367,13 @@ [Components.common] MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf + +[Components.AARCH64] + # + # ACPI Support + # + MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf + OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf { + + NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf + } diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf index 1229e6bd43cc..772b0f6ed982 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.fdf +++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf @@ -218,11 +218,13 @@ [FV.FvMain] INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf +!if $(ARCH) == AARCH64 # # ACPI Support # INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf INF OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf +!endif # # PCI support