From patchwork Thu Nov 30 20:31:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 120277 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp362618edl; Thu, 30 Nov 2017 12:31:27 -0800 (PST) X-Google-Smtp-Source: AGs4zMZP9ANWP3aNghoNksDbqIWkBcrNvUeXOLt1E53O/S/Z98EHIqahW0AD9NFFPkcO63c4BwaO X-Received: by 10.159.242.4 with SMTP id t4mr3769422plr.411.1512073887170; Thu, 30 Nov 2017 12:31:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512073887; cv=none; d=google.com; s=arc-20160816; b=AV/9hIlPB3aqOqoWey0UK0A9sOCREdZYqfDT49wmflD3rTcjZGnpl/rfwZE42+hezz FTsiJh+24BYyd1+euUXGJ8sV7CGIebKwtR1hQHZ/rFvMa6+DneXN63OfYaXaYXbbXKzW FDcovCqVgSqDmLTy8aL/CiS7CJii7gOf9EzOZ9kjF4DegfkttJ4T1q+e+7a5RikJo7aa PJR6jmzU+VDjhuKximv6M3xXzz3etVdDLqRVy9ZOHNQNHm9fthZqsAic7PLKKTYmM/+A TFsIEOwwFWcIthMix2uS2EOJ0qp/H3noAYvGybimy2jYrsUCGu7gAJzqhGU/WldtChYP M/7w== 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:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=o43nLc0+KkcGPxH0m6W4OesCQmeaiz3eXBh16AA9k5E=; b=DcuAC8hEQVpGcPdpSr9BS9gspuTvzGE4phHDyu5y4DxtHbocsQ0XB1Yl9/FSRrQPlQ 6b/v86dk5EqS7ipwtZBWr3oFghBxx1nJff2y2CCWGqlpZgjxAXM2wsJ71Ib4SZzE3AvY jGtbGkVX31CD1S8kIeve5Y51pnn8tL3mGve40OOCM2PLWRDeAsboXLCW1hN2i3pH+yoF N7RtPbDTkAQCo7Hsle00VbDEh8cccPMdW9PerfP7/N2ESOhjmyAQvBiFcXO1TDzdmDnh 3Km1iDeuj2ZVQNeO4MZ4VfBnxJ0NHbe4mD+jsJP0kExx5qeWIAwDwY9GeBm+fgoItUFd oJ7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=VVmfMxFL; 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 sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id v31si3695053plg.274.2017.11.30.12.31.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Nov 2017 12:31:27 -0800 (PST) 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 header.s=google header.b=VVmfMxFL; 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 sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 2F8B1203564AE; Thu, 30 Nov 2017 12:27:00 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::241; helo=mail-wr0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) (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 BF0082034A797 for ; Thu, 30 Nov 2017 12:26:58 -0800 (PST) Received: by mail-wr0-x241.google.com with SMTP id s66so7888966wrc.9 for ; Thu, 30 Nov 2017 12:31:24 -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=F/ZZEg4SnID0sboFCHoOp8ZR5iyPiQPTZ8hhqn3cBkM=; b=VVmfMxFLecIVxc4KRkXvpS/e52wZ15k0bEfvBCI8xNRak+8zFUyCVeoD2gVP75D+pY YJloxncMwFb3lkwPEXLgt1GBjkY6FQfZH+LV7tHYx9RPd0WpfvIb+I4A3WSsOG6qi/uJ ptNKQAft2l9p5CUMBqRXQAC0usJ630gGzuBeM= 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=F/ZZEg4SnID0sboFCHoOp8ZR5iyPiQPTZ8hhqn3cBkM=; b=LayAVjq/1Y81voJ48Ydp+YiEKjbzRrcQEh30+3dErHuEua/I3MrHB5RygiWxRrMH5j ZngYcRS1bINdt2K2yXiu8oq976A+ERJZ/DsAHo3lxVmN3WFv62brW7MingNSo6QWJ+ju apcva4C6G5o7Jud5A/GK8HZFdxTa2ev57xy7jj3WCV3Xc6/3VBNuAPf9mnW3cfMfUxWA WeVJNy6uSNT8WkD6EQAKo7VL0+aicj3NYznJc6ZSUtGAY+7RxQKaWkr4AHg/zi5i9uJV TWAxSzdpZCJmValzgPJy6a4iDGN51oNcIukrfEAGCUGrKQelGg7Yp/38awkhpt1RitVl L3Ig== X-Gm-Message-State: AJaThX6oAe+1H83mHrMMnoUAe5FksasDe3ziopEqVnAzP6fl84pXWYyi BHj01AQQFGD5tGHcj7SIln7hLWkmmqM= X-Received: by 10.223.153.247 with SMTP id y110mr3316461wrb.248.1512073882275; Thu, 30 Nov 2017 12:31:22 -0800 (PST) Received: from localhost.localdomain ([105.150.171.234]) by smtp.gmail.com with ESMTPSA id f6sm2250347wre.66.2017.11.30.12.31.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Nov 2017 12:31:21 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Thu, 30 Nov 2017 20:31:14 +0000 Message-Id: <20171130203114.19464-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 Subject: [edk2] [PATCH RFT] ArmVirtPkg/ArmVirtXen: move from Intel to generic BDS X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lersek@redhat.com, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" ArmVirtXen is the only remaining consumer of ArmPlatformPkg's PlatformIntelBdsLib implementation, which is tightly coupled to the deprecated Intel BDS. So move ArmVirtXen to the generic BDS as well, allowing us to get rid of PlatformIntelBdsLib entirely. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtXen.dsc | 14 +++++++++++--- ArmVirtPkg/ArmVirtXen.fdf | 3 ++- 2 files changed, 13 insertions(+), 4 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Acked-by: Laszlo Ersek diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc index 11e073287a84..ae43d5990110 100644 --- a/ArmVirtPkg/ArmVirtXen.dsc +++ b/ArmVirtPkg/ArmVirtXen.dsc @@ -48,8 +48,9 @@ [LibraryClasses] TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf - GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf - PlatformBdsLib|ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf + UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf + BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf + PlatformBootManagerLib|ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf [LibraryClasses.common.UEFI_DRIVER] @@ -86,6 +87,7 @@ [PcdsFixedAtBuild.common] gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0 gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE + gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } [PcdsPatchableInModule.common] @@ -199,7 +201,13 @@ [Components.common] MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf + MdeModulePkg/Universal/BdsDxe/BdsDxe.inf + MdeModulePkg/Application/UiApp/UiApp.inf { + + NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf + NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf + NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf + } OvmfPkg/XenBusDxe/XenBusDxe.inf OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf index 6586ce6be505..50e670254d52 100644 --- a/ArmVirtPkg/ArmVirtXen.fdf +++ b/ArmVirtPkg/ArmVirtXen.fdf @@ -177,7 +177,8 @@ [FV.FvMain] INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf + INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf + INF MdeModulePkg/Application/UiApp/UiApp.inf INF OvmfPkg/XenBusDxe/XenBusDxe.inf INF OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf