On 1 December 2017 at 10:08, Laszlo Ersek <ler...@redhat.com> wrote:
> On 11/30/17 21:31, Ard Biesheuvel wrote:
>> 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 <ard.biesheu...@linaro.org>
>> ---
>> ArmVirtPkg/ArmVirtXen.dsc | 14 +++++++++++---
>> ArmVirtPkg/ArmVirtXen.fdf | 3 ++-
>> 2 files changed, 13 insertions(+), 4 deletions(-)
>>
>> 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 {
>> + <LibraryClasses>
>> + 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
>>
>
> The patch looks fine, and I agree that the main thing that should decide
> about it is testing by Julien.
>
> Acked-by: Laszlo Ersek <ler...@redhat.com>
>
Pushed as 75e2d0e02f1c40a2e4971bd67399028e0b1681c8, after folding in
the changes that Julien tested.
Thanks all.
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
