diff mbox

[edk2] ArmVirtPkg: move UefiBootManagerLib resolution to ArmVirt.dsc.inc

Message ID 1488355525-29098-1-git-send-email-ard.biesheuvel@linaro.org
State Accepted
Commit dd320e633a8a80c93c9c43535d3bec7606c45b12
Headers show

Commit Message

Ard Biesheuvel March 1, 2017, 8:05 a.m. UTC 
Recent changes to ShellPkg require a resolution for UefiBootManagerLib
for all platforms in ArmVirtPkg. So move the resolution to the shared
include ArmVirt.dsc.inc.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 ArmVirtPkg/ArmVirt.dsc.inc       | 1 +
 ArmVirtPkg/ArmVirtQemu.dsc       | 1 -
 ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

-- 
2.7.4

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Ni, Ruiyu March 1, 2017, 9:03 a.m. UTC | #1 
Ard,
Thanks for the patch.

Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>


Thanks/Ray

> -----Original Message-----

> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of

> Ard Biesheuvel

> Sent: Wednesday, March 1, 2017 4:05 PM

> To: edk2-devel@lists.01.org; lersek@redhat.com

> Cc: Ni, Ruiyu <ruiyu.ni@intel.com>; Ard Biesheuvel

> <ard.biesheuvel@linaro.org>

> Subject: [edk2] [PATCH] ArmVirtPkg: move UefiBootManagerLib resolution

> to ArmVirt.dsc.inc

> 

> Recent changes to ShellPkg require a resolution for UefiBootManagerLib for

> all platforms in ArmVirtPkg. So move the resolution to the shared include

> ArmVirt.dsc.inc.

> 

> Contributed-under: TianoCore Contribution Agreement 1.0

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---

>  ArmVirtPkg/ArmVirt.dsc.inc       | 1 +

>  ArmVirtPkg/ArmVirtQemu.dsc       | 1 -

>  ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 -

>  3 files changed, 1 insertion(+), 2 deletions(-)

> 

> diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index

> d40ea69b072d..2b0a44e14d24 100644

> --- a/ArmVirtPkg/ArmVirt.dsc.inc

> +++ b/ArmVirtPkg/ArmVirt.dsc.inc

> @@ -151,6 +151,7 @@ [LibraryClasses.common]

> 

> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableL

> ibNull.inf

>  !endif

>    VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf

> +

> +

> UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBoo

> tMan

> + agerLib.inf

> 

>  [LibraryClasses.common.SEC]

>    PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

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

> index 00cdd7c20201..615e1fca4877 100644

> --- a/ArmVirtPkg/ArmVirtQemu.dsc

> +++ b/ArmVirtPkg/ArmVirtQemu.dsc

> @@ -60,7 +60,6 @@ [LibraryClasses.common]

> 

> NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLi

> b.inf

> 

> 

> CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.i

> nf

> -

> UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBoo

> tManagerLib.inf

>    BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf

> 

> PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/Plat

> formBootManagerLib.inf

> 

> CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Custo

> mizedDisplayLib.inf

> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc

> b/ArmVirtPkg/ArmVirtQemuKernel.dsc

> index 8354b13ddb1a..e4902690123c 100644

> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc

> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc

> @@ -59,7 +59,6 @@ [LibraryClasses.common]

> 

> NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLi

> b.inf

> 

> 

> CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.i

> nf

> -

> UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBoo

> tManagerLib.inf

>    BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf

> 

> PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/Plat

> formBootManagerLib.inf

> 

> CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Custo

> mizedDisplayLib.inf

> --

> 2.7.4

> 

> _______________________________________________

> edk2-devel mailing list

> edk2-devel@lists.01.org

> https://lists.01.org/mailman/listinfo/edk2-devel

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Laszlo Ersek March 1, 2017, 9:27 a.m. UTC | #2 
On 03/01/17 09:05, Ard Biesheuvel wrote:
> Recent changes to ShellPkg require a resolution for UefiBootManagerLib

> for all platforms in ArmVirtPkg. So move the resolution to the shared

> include ArmVirt.dsc.inc.

> 

> Contributed-under: TianoCore Contribution Agreement 1.0

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---

>  ArmVirtPkg/ArmVirt.dsc.inc       | 1 +

>  ArmVirtPkg/ArmVirtQemu.dsc       | 1 -

>  ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 -

>  3 files changed, 1 insertion(+), 2 deletions(-)

> 

> diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc

> index d40ea69b072d..2b0a44e14d24 100644

> --- a/ArmVirtPkg/ArmVirt.dsc.inc

> +++ b/ArmVirtPkg/ArmVirt.dsc.inc

> @@ -151,6 +151,7 @@ [LibraryClasses.common]

>    AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf

>  !endif

>    VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf

> +  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf

>  

>  [LibraryClasses.common.SEC]

>    PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

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

> index 00cdd7c20201..615e1fca4877 100644

> --- a/ArmVirtPkg/ArmVirtQemu.dsc

> +++ b/ArmVirtPkg/ArmVirtQemu.dsc

> @@ -60,7 +60,6 @@ [LibraryClasses.common]

>    NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf

>  

>    CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

> -  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf

>    BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf

>    PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf

>    CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf

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

> index 8354b13ddb1a..e4902690123c 100644

> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc

> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc

> @@ -59,7 +59,6 @@ [LibraryClasses.common]

>    NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf

>  

>    CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

> -  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf

>    BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf

>    PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf

>    CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf

> 


Reviewed-by: Laszlo Ersek <lersek@redhat.com>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ard Biesheuvel March 1, 2017, 11:46 a.m. UTC | #3 
On 1 March 2017 at 09:27, Laszlo Ersek <lersek@redhat.com> wrote:
> On 03/01/17 09:05, Ard Biesheuvel wrote:

>> Recent changes to ShellPkg require a resolution for UefiBootManagerLib

>> for all platforms in ArmVirtPkg. So move the resolution to the shared

>> include ArmVirt.dsc.inc.

>>

>> Contributed-under: TianoCore Contribution Agreement 1.0

>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

>> ---

>>  ArmVirtPkg/ArmVirt.dsc.inc       | 1 +

>>  ArmVirtPkg/ArmVirtQemu.dsc       | 1 -

>>  ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 -

>>  3 files changed, 1 insertion(+), 2 deletions(-)

>>

>> diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc

>> index d40ea69b072d..2b0a44e14d24 100644

>> --- a/ArmVirtPkg/ArmVirt.dsc.inc

>> +++ b/ArmVirtPkg/ArmVirt.dsc.inc

>> @@ -151,6 +151,7 @@ [LibraryClasses.common]

>>    AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf

>>  !endif

>>    VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf

>> +  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf

>>

>>  [LibraryClasses.common.SEC]

>>    PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

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

>> index 00cdd7c20201..615e1fca4877 100644

>> --- a/ArmVirtPkg/ArmVirtQemu.dsc

>> +++ b/ArmVirtPkg/ArmVirtQemu.dsc

>> @@ -60,7 +60,6 @@ [LibraryClasses.common]

>>    NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf

>>

>>    CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

>> -  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf

>>    BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf

>>    PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf

>>    CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf

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

>> index 8354b13ddb1a..e4902690123c 100644

>> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc

>> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc

>> @@ -59,7 +59,6 @@ [LibraryClasses.common]

>>    NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf

>>

>>    CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

>> -  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf

>>    BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf

>>    PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf

>>    CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf

>>

>

> Reviewed-by: Laszlo Ersek <lersek@redhat.com>


Pushed, thanks.
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
diff mbox

Patch

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index d40ea69b072d..2b0a44e14d24 100644
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -151,6 +151,7 @@  [LibraryClasses.common]
   AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
 !endif
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
 
 [LibraryClasses.common.SEC]
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 00cdd7c20201..615e1fca4877 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -60,7 +60,6 @@  [LibraryClasses.common]
   NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
 
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
-  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
   PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 8354b13ddb1a..e4902690123c 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -59,7 +59,6 @@  [LibraryClasses.common]
   NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
 
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
-  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
   PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf