| Message ID | 1477415736-11265-3-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | Accepted |
| Commit | 510e88ee39571862f2fcc66b900b581d06a56357 |
| Headers | show |
On Tue, Oct 25, 2016 at 06:15:33PM +0100, Ard Biesheuvel wrote: > Before moving to the generic BDS, copy the global BdsLib resolution to > the respective clients so we can drop it later. That way, no new code > will inadvertently bind to it, and it is more obvious which modules > still need to be brought into the 21st century. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Hah, I reviewed this last night, but forgot to actually send the email: Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> > --- > Platforms/ARM/Juno/ArmJuno.dsc | 5 ++++- > Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc | 5 ++++- > Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc | 5 ++++- > Platforms/ARM/VExpress/ArmVExpress.dsc.inc | 15 ++++++++++++--- > 4 files changed, 24 insertions(+), 6 deletions(-) > > diff --git a/Platforms/ARM/Juno/ArmJuno.dsc b/Platforms/ARM/Juno/ArmJuno.dsc > index 69a2e4392c1c..d5f06c2b4211 100644 > --- a/Platforms/ARM/Juno/ArmJuno.dsc > +++ b/Platforms/ARM/Juno/ArmJuno.dsc > @@ -313,7 +313,10 @@ > # > # Juno platform driver > # > - ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf > + ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf { > + <LibraryClasses> > + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf > + } > SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf { > <LibraryClasses> > # DO NOT USE THIS LIBRARY FOR PRODUCTION DEVICES > diff --git a/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc > index e95a3c1cd1bc..1a0fba9e6e2a 100644 > --- a/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc > +++ b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc > @@ -257,7 +257,10 @@ > # > # Platform > # > - ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf > + ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf { > + <LibraryClasses> > + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf > + } > > # > # Filesystems > diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc > index 60df45dca276..d019b09f6456 100644 > --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc > +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc > @@ -298,7 +298,10 @@ > # > # Platform Driver > # > - ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > + ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf { > + <LibraryClasses> > + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf > + } > OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > > # > diff --git a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc > index 3526da121c43..a78046d016e0 100644 > --- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc > +++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc > @@ -479,7 +479,10 @@ > # > # Android Fastboot > # > - EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf > + EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf { > + <LibraryClasses> > + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf > + } > EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf > ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf > > @@ -489,7 +492,10 @@ > # > # FDT installation > # > - EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf > + EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { > + <LibraryClasses> > + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf > + } > > # > # UEFI application (Shell Embedded Boot Loader) > @@ -512,4 +518,7 @@ > > [Components.ARM] > # Legacy Linux Loader > - ArmPkg/Application/LinuxLoader/LinuxLoader.inf > + ArmPkg/Application/LinuxLoader/LinuxLoader.inf { > + <LibraryClasses> > + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf > + } > -- > 2.7.4 >
diff --git a/Platforms/ARM/Juno/ArmJuno.dsc b/Platforms/ARM/Juno/ArmJuno.dsc index 69a2e4392c1c..d5f06c2b4211 100644 --- a/Platforms/ARM/Juno/ArmJuno.dsc +++ b/Platforms/ARM/Juno/ArmJuno.dsc @@ -313,7 +313,10 @@ # # Juno platform driver # - ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf + ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf { + <LibraryClasses> + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf + } SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf { <LibraryClasses> # DO NOT USE THIS LIBRARY FOR PRODUCTION DEVICES diff --git a/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc index e95a3c1cd1bc..1a0fba9e6e2a 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc +++ b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc @@ -257,7 +257,10 @@ # # Platform # - ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf + ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf { + <LibraryClasses> + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf + } # # Filesystems diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc index 60df45dca276..d019b09f6456 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc @@ -298,7 +298,10 @@ # # Platform Driver # - ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf + ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf { + <LibraryClasses> + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf + } OvmfPkg/VirtioBlkDxe/VirtioBlk.inf # diff --git a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc index 3526da121c43..a78046d016e0 100644 --- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc +++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc @@ -479,7 +479,10 @@ # # Android Fastboot # - EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf + EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf { + <LibraryClasses> + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf + } EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf @@ -489,7 +492,10 @@ # # FDT installation # - EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf + EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { + <LibraryClasses> + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf + } # # UEFI application (Shell Embedded Boot Loader) @@ -512,4 +518,7 @@ [Components.ARM] # Legacy Linux Loader - ArmPkg/Application/LinuxLoader/LinuxLoader.inf + ArmPkg/Application/LinuxLoader/LinuxLoader.inf { + <LibraryClasses> + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf + }
Before moving to the generic BDS, copy the global BdsLib resolution to the respective clients so we can drop it later. That way, no new code will inadvertently bind to it, and it is more obvious which modules still need to be brought into the 21st century. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- Platforms/ARM/Juno/ArmJuno.dsc | 5 ++++- Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc | 5 ++++- Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc | 5 ++++- Platforms/ARM/VExpress/ArmVExpress.dsc.inc | 15 ++++++++++++--- 4 files changed, 24 insertions(+), 6 deletions(-)