diff mbox series

[edk2,RFT] ArmVirtPkg/ArmVirtXen: move from Intel to generic BDS

Message ID 20171130203114.19464-1-ard.biesheuvel@linaro.org
State Accepted
Commit 75e2d0e02f1c40a2e4971bd67399028e0b1681c8
Headers show
Series [edk2,RFT] ArmVirtPkg/ArmVirtXen: move from Intel to generic BDS | expand

Commit Message

Ard Biesheuvel Nov. 30, 2017, 8:31 p.m. UTC 
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.biesheuvel@linaro.org>

---
 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

Comments

Laszlo Ersek Dec. 1, 2017, 10:08 a.m. UTC | #1 
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.biesheuvel@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 <lersek@redhat.com>


Thanks!
Laszlo
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Julien Grall Dec. 4, 2017, 3:19 p.m. UTC | #2 
Hi Ard,

On 30/11/17 20: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.


It was in my list of UEFI part I wanted to look next :).
I tested it and hit the following assert:

ASSERT [BdsDxe] /home/julieng/works/edk2/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c(502): 0 == 4

Looking at the ArmVirtQemu.dsc, I made the below modification.
When I tried the version protected by TTY_ENABLE, the ASSERT was
still present.

diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
index ae43d59901..bc76a780be 100644
--- a/ArmVirtPkg/ArmVirtXen.dsc
+++ b/ArmVirtPkg/ArmVirtXen.dsc
@@ -81,6 +81,10 @@
   # Size of the region used by UEFI in permanent memory (Reserved 64MB)
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000
 
+  ## Default Terminal Type^M
+  ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM^M
+  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4^M
+^M
   #
   # ARM Virtual Architectural Timer
   #

My knowledge in UEFI is still limited, so I would appreciate any
feedbacks here.

Cheers,

-- 
Julien Grall
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ard Biesheuvel Dec. 4, 2017, 3:52 p.m. UTC | #3 
On 4 December 2017 at 15:19, Julien Grall <julien.grall@linaro.org> wrote:
> Hi Ard,

>

> On 30/11/17 20: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.

>

> It was in my list of UEFI part I wanted to look next :).

> I tested it and hit the following assert:

>

> ASSERT [BdsDxe] /home/julieng/works/edk2/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c(502): 0 == 4

>

> Looking at the ArmVirtQemu.dsc, I made the below modification.

> When I tried the version protected by TTY_ENABLE, the ASSERT was

> still present.

>

> diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc

> index ae43d59901..bc76a780be 100644

> --- a/ArmVirtPkg/ArmVirtXen.dsc

> +++ b/ArmVirtPkg/ArmVirtXen.dsc

> @@ -81,6 +81,10 @@

>    # Size of the region used by UEFI in permanent memory (Reserved 64MB)

>    gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000

>

> +  ## Default Terminal Type^M

> +  ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM^M

> +  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4^M

> +^M

>    #

>    # ARM Virtual Architectural Timer

>    #

>

> My knowledge in UEFI is still limited, so I would appreciate any

> feedbacks here.

>


My bad.

Could you please try with this applied on top?

diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
index 11e073287a84..5ddcfceef9dc 100644
--- a/ArmVirtPkg/ArmVirtXen.dsc
+++ b/ArmVirtPkg/ArmVirtXen.dsc
@@ -88,6 +88,13 @@ [PcdsFixedAtBuild.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83,
0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52,
0x68, 0xD0, 0xB4, 0xD1 }

+  ## Default Terminal Type
+  ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM
+  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4
+
+  # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID
+  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91,
0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51,
0xef, 0x94}
+
 [PcdsPatchableInModule.common]
   #
   # This will be overridden in the code

(and don't bother with the -D TTY_TERMINAL, it will be the default anyway)
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ard Biesheuvel Dec. 4, 2017, 3:55 p.m. UTC | #4 
On 4 December 2017 at 15:52, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> On 4 December 2017 at 15:19, Julien Grall <julien.grall@linaro.org> wrote:

>> Hi Ard,

>>

>> On 30/11/17 20: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.

>>

>> It was in my list of UEFI part I wanted to look next :).

>> I tested it and hit the following assert:

>>

>> ASSERT [BdsDxe] /home/julieng/works/edk2/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c(502): 0 == 4

>>

>> Looking at the ArmVirtQemu.dsc, I made the below modification.

>> When I tried the version protected by TTY_ENABLE, the ASSERT was

>> still present.

>>

>> diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc

>> index ae43d59901..bc76a780be 100644

>> --- a/ArmVirtPkg/ArmVirtXen.dsc

>> +++ b/ArmVirtPkg/ArmVirtXen.dsc

>> @@ -81,6 +81,10 @@

>>    # Size of the region used by UEFI in permanent memory (Reserved 64MB)

>>    gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000

>>

>> +  ## Default Terminal Type^M

>> +  ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM^M

>> +  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4^M

>> +^M

>>    #

>>    # ARM Virtual Architectural Timer

>>    #

>>

>> My knowledge in UEFI is still limited, so I would appreciate any

>> feedbacks here.

>>

>

> My bad.

>

> Could you please try with this applied on top?

>

> diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc

> index 11e073287a84..5ddcfceef9dc 100644

> --- a/ArmVirtPkg/ArmVirtXen.dsc

> +++ b/ArmVirtPkg/ArmVirtXen.dsc

> @@ -88,6 +88,13 @@ [PcdsFixedAtBuild.common]

>    gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE

>    gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83,

> 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52,

> 0x68, 0xD0, 0xB4, 0xD1 }

>

> +  ## Default Terminal Type

> +  ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM

> +  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4

> +

> +  # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID

> +  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91,

> 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51,

> 0xef, 0x94}

> +

>  [PcdsPatchableInModule.common]

>    #

>    # This will be overridden in the code

>

> (and don't bother with the -D TTY_TERMINAL, it will be the default anyway)



Hmm, looking again, what you tried should actually be equivalent.
Could you try a clean rebuild please? Thanks.
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Julien Grall Dec. 4, 2017, 4:08 p.m. UTC | #5 
Hi Ard,

On 04/12/17 15:55, Ard Biesheuvel wrote:
> On 4 December 2017 at 15:52, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:

>> On 4 December 2017 at 15:19, Julien Grall <julien.grall@linaro.org> wrote:

>>> On 30/11/17 20:31, Ard Biesheuvel wrote:

> Hmm, looking again, what you tried should actually be equivalent.

> Could you try a clean rebuild please? Thanks.


I have applied your 2 patches and test a clean rebuild. I have seen no 
issue.

Feel free to add my tested-by.

Cheers,


-- 
Julien Grall
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ard Biesheuvel Dec. 4, 2017, 4:09 p.m. UTC | #6 
On 4 December 2017 at 16:08, Julien Grall <julien.grall@linaro.org> wrote:
> Hi Ard,

>

> On 04/12/17 15:55, Ard Biesheuvel wrote:

>>

>> On 4 December 2017 at 15:52, Ard Biesheuvel <ard.biesheuvel@linaro.org>

>> wrote:

>>>

>>> On 4 December 2017 at 15:19, Julien Grall <julien.grall@linaro.org>

>>> wrote:

>>>>

>>>> On 30/11/17 20:31, Ard Biesheuvel wrote:

>>

>> Hmm, looking again, what you tried should actually be equivalent.

>> Could you try a clean rebuild please? Thanks.

>

>

> I have applied your 2 patches and test a clean rebuild. I have seen no

> issue.

>

> Feel free to add my tested-by.

>


Thanks! Much appreciated.
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ard Biesheuvel Dec. 4, 2017, 4:15 p.m. UTC | #7 
On 1 December 2017 at 10:08, Laszlo Ersek <lersek@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.biesheuvel@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 <lersek@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
diff mbox series

Patch

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