| Message ID | 1466607676-28487-1-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | Accepted |
| Commit | 998d9916bea4cd162652b85467f3b922f6285059 |
| Headers | show |
On 22 June 2016 at 16:01, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: > The DXE module NorFlashAuthenticatedDxe no longer exists upstream, now > that its functionality has been merged into the ordinary NorFlashDxe, > which now supports for non-secure boot and secure boot builds. So replace > all references to it with NorFlashDxe. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-by: Ryan Harkin <ryan.harkin@linaro.org> > --- > Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc | 4 ---- > Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf | 4 ---- > 2 files changed, 8 deletions(-) > > diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc > index 92af088b7759..0f03b479c63e 100644 > --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc > +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc > @@ -280,11 +280,7 @@ > OpenPlatformPkg/Platforms/ARM/VExpress/AcpiTables/rtsm_ve-aemv8a/AcpiTables.inf > > ArmPkg/Drivers/ArmGic/ArmGicDxe.inf > -!if $(SECURE_BOOT_ENABLE) == TRUE > - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf > -!else > ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > -!endif > ArmPkg/Drivers/TimerDxe/TimerDxe.inf > !ifdef EDK2_ENABLE_PL111 > ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf > diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf > index b49d452e85e5..41267baae344 100644 > --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf > +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf > @@ -112,11 +112,7 @@ FvNameGuid = 87940482-fc81-41c3-87e6-399cf85ac8a0 > > INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf > INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf > -!if $(SECURE_BOOT_ENABLE) == TRUE > - INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf > -!else > INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > -!endif > !ifdef EDK2_ENABLE_PL111 > INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf > !endif > -- > 2.7.4 >
On 23 June 2016 at 13:14, Ryan Harkin <ryan.harkin@linaro.org> wrote: > On 22 June 2016 at 16:01, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: >> The DXE module NorFlashAuthenticatedDxe no longer exists upstream, now >> that its functionality has been merged into the ordinary NorFlashDxe, >> which now supports for non-secure boot and secure boot builds. So replace >> all references to it with NorFlashDxe. >> >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > Reviewed-by: Ryan Harkin <ryan.harkin@linaro.org> > Committed as 998d9916bea4 Thanks, Ard.
diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc index 92af088b7759..0f03b479c63e 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc @@ -280,11 +280,7 @@ OpenPlatformPkg/Platforms/ARM/VExpress/AcpiTables/rtsm_ve-aemv8a/AcpiTables.inf ArmPkg/Drivers/ArmGic/ArmGicDxe.inf -!if $(SECURE_BOOT_ENABLE) == TRUE - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf -!else ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf -!endif ArmPkg/Drivers/TimerDxe/TimerDxe.inf !ifdef EDK2_ENABLE_PL111 ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf index b49d452e85e5..41267baae344 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf @@ -112,11 +112,7 @@ FvNameGuid = 87940482-fc81-41c3-87e6-399cf85ac8a0 INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf -!if $(SECURE_BOOT_ENABLE) == TRUE - INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf -!else INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf -!endif !ifdef EDK2_ENABLE_PL111 INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf !endif
The DXE module NorFlashAuthenticatedDxe no longer exists upstream, now that its functionality has been merged into the ordinary NorFlashDxe, which now supports for non-secure boot and secure boot builds. So replace all references to it with NorFlashDxe. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc | 4 ---- Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf | 4 ---- 2 files changed, 8 deletions(-)