From patchwork Mon Feb 22 16:40:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 62611 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1345289lbl; Mon, 22 Feb 2016 08:40:24 -0800 (PST) X-Received: by 10.66.152.231 with SMTP id vb7mr39459681pab.132.1456159223874; Mon, 22 Feb 2016 08:40:23 -0800 (PST) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id uv2si40727081pac.41.2016.02.22.08.40.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Feb 2016 08:40:23 -0800 (PST) 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; 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; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1F2301A1E4E; Mon, 22 Feb 2016 08:40:25 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x22f.google.com (mail-wm0-x22f.google.com [IPv6:2a00:1450:400c:c09::22f]) (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 CC15B1A1DEF for ; Mon, 22 Feb 2016 08:40:22 -0800 (PST) Received: by mail-wm0-x22f.google.com with SMTP id g62so172194353wme.0 for ; Mon, 22 Feb 2016 08:40:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=33l8xfNBhFdqxDN2q+OSGGqpAPFGsMAAmRGbWaIJoY8=; b=XtKHZ84gzQ2BrE8O6HDO8jybuCxTCfbFV28YK3duXeMdXETsTUVmm4KqosllW9ZDqk bLEQfD228tUbOQcJa+fDQPkNmBR2wTudHvTBQakPCkep0QXxPhk6PwJLpVHyO+1PV5Vx LigQlOVIvmgjJZwesuBXBwcBhrfeDKBuu2/cg= 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=33l8xfNBhFdqxDN2q+OSGGqpAPFGsMAAmRGbWaIJoY8=; b=XmOdJAevXMhjAtd18DmlAPEo4h17wROxGTtGtmgGYlQnd68jKhJW5O1Pr1aSN6eveo C83bODzRtS1QlnEdPaRUwzCdn58jNnSvtifcOU2m2s02SIg8rm5Jz3GE/yz9OZFMMoq4 dLVtL4hWp2c8qI0vPXjolKTss3Y9P2Rg5KPJS+2lIwretbJSFIiJVMHnaRPYZYdRwh5w MXu4CgbyRNJ9D+f3pbcntEmlgMXwU9mVzGMR2PqdefcyorRWLRceN/n24RGdxN4mS9Ay TjEYxpwrtFNEFfpSNpr92bR3y1SGQ0IzO2lGagPMq535ZVSCYsn8EspN4qwhsCkf9lW7 OJiw== X-Gm-Message-State: AG10YOTlxgsf6Y9uHjKR9kH2Te2Ojs3hAjmPrb3MVqeUOTNA0jBpGOM19KmH1E3Nvsfb4mDS X-Received: by 10.28.230.82 with SMTP id d79mr13743430wmh.103.1456159219023; Mon, 22 Feb 2016 08:40:19 -0800 (PST) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id u4sm25478398wjz.4.2016.02.22.08.40.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Feb 2016 08:40:18 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Mon, 22 Feb 2016 17:40:14 +0100 Message-Id: <1456159214-1301-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 Cc: lersek@redhat.com, leif.lindholm@linaro.org, Ard Biesheuvel Subject: [edk2] [PATCH] ArmVirtPkg: ArmVirtQemu: make ACPI support AARCH64 only X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 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. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtQemu.dsc | 13 +++++++------ ArmVirtPkg/ArmVirtQemu.fdf | 2 ++ 2 files changed, 9 insertions(+), 6 deletions(-) -- 2.5.0 _______________________________________________ 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/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 032f72cb9e17..146db202c60e 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -347,12 +347,6 @@ [Components.common] OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf # - # ACPI Support - # - MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf - OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf - - # # PCI support # ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf @@ -377,6 +371,13 @@ [Components.common] 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 + [Components.ARM] # # The ARM/Linux kernel has no built in EFI boot stub (yet), so we still need diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf index b57b56c645dc..ef456539cc62 100644 --- a/ArmVirtPkg/ArmVirtQemu.fdf +++ b/ArmVirtPkg/ArmVirtQemu.fdf @@ -202,11 +202,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