From patchwork Tue Jul 12 09:16:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 71791 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp366709qga; Tue, 12 Jul 2016 02:16:36 -0700 (PDT) X-Received: by 10.98.52.3 with SMTP id b3mr42757889pfa.40.1468314995960; Tue, 12 Jul 2016 02:16:35 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id u125si3124505pfb.245.2016.07.12.02.16.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jul 2016 02:16:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; 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 198.145.21.10 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 DA4031A1E56; Tue, 12 Jul 2016 02:17:19 -0700 (PDT) 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 054F41A1E01 for ; Tue, 12 Jul 2016 02:17:18 -0700 (PDT) Received: by mail-wm0-x22f.google.com with SMTP id f126so120617415wma.1 for ; Tue, 12 Jul 2016 02:16:33 -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=iqkaqFhtLTTFFBsLJpjhuJ48fe/y8vayr0Q9F2YtOWc=; b=RBaf5xuuakvwQ215sEOTCe/tOb+D4nBeH6RT9V6P8wp3G7bCB9kDlVfB3YbV390GCs Nm1n3CUD4moGMVTxzmRm8F5niDG0iBAE5VnDUg87VYpPMlwO7a0kpik2ci7MN43qLvwA ZW+mUIppPWHxXgKGL8ysjANID9dlbC52MM7p0= 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=iqkaqFhtLTTFFBsLJpjhuJ48fe/y8vayr0Q9F2YtOWc=; b=iNJ6JlkM9UYIeTgr8Pl1/3IKhhKtCKlpWlxTjXUT2f4OJ5CuVubzLMct3mONlk5iP+ bkSuDI65GdpDk4+dTRklgKSZu7TqpiVK5BbBzYPhQIqbtqzvrHLFadn3Hctwx5dU9JVw y70+uQMEEda/7uIiMGfxJoVfMuJmScehqxFDXUJx/b5FI+gIXoP00gY73cnSk1pVY0Mj 8UwP9VfGVnJai7z5MtUw6Rsp+mvc7e5xgm1BR8FKIYzPsZxtnQCpYj4whx9rC60ST01n 7ff0O4Vrh3/Kw9EpMbGHnLCeW9XRiLN4VSRtjQ/Qw5r/t2IchRIpHbpOe0ueuIemns3W Qs3w== X-Gm-Message-State: ALyK8tKf+YqpS3CzHBXtfatyY7TEAaPGjRs+ucjpYB9qlGpnrXPql6VWvQYwdu9LuyN3NMZg X-Received: by 10.28.23.17 with SMTP id 17mr17874692wmx.21.1468314991390; Tue, 12 Jul 2016 02:16:31 -0700 (PDT) Received: from localhost.localdomain ([188.203.148.129]) by smtp.gmail.com with ESMTPSA id m125sm371029wmm.8.2016.07.12.02.16.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Jul 2016 02:16:30 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, lersek@redhat.com Date: Tue, 12 Jul 2016 11:16:24 +0200 Message-Id: <1468314987-19885-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468314987-19885-1-git-send-email-ard.biesheuvel@linaro.org> References: <1468314987-19885-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 1/4] ArmVirtPkg: align ArmVirtQemuKernel.fdf with ArmVirtQemu.fdf 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 platform ArmVirtQemuKernel is intended as an alternative for ArmVirtQemu that only deviates in the way it is invoked by QEMU, either from flash address 0x0 (the default ARM reset vector) or via the Linux kernel boot protocol. So clean up a couple of discrepancies that crept in over time, i.e., missing VirtioRngDxe and HighMemDxe, and the conditional inclusion of the ACPI related drivers. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtQemuKernel.fdf | 4 ++++ 1 file changed, 4 insertions(+) -- 1.9.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf index 1229e6bd43cc..dcea9771a288 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.fdf +++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf @@ -128,6 +128,7 @@ [FV.FvMain] INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf + INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf # # PI DXE Drivers producing Architectural Protocols (EFI Services) @@ -175,6 +176,7 @@ [FV.FvMain] INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf INF OvmfPkg/VirtioNetDxe/VirtioNet.inf INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf + INF OvmfPkg/VirtioRngDxe/VirtioRng.inf # # UEFI application (Shell Embedded Boot Loader) @@ -218,11 +220,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