From 146961937861facc57a4428be23594102bd9cb23 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Tue, 21 Jun 2016 12:14:41 +0200 Subject: [PATCH] ArmVirtPkg/ArmVirtQemu: switch secure boot build to NorFlashDxe There is no longer a reason to use a different implementation of NorFlashDxe for secure boot builds now that the varstore FV header can carry either gEfiVariableGuid or gEfiAuthenticatedVariableGuid, and the dependent code has been updated to deal with that. So move the secure boot capable builds to the common NorFlashDxe. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel Reviewed-by: Laszlo Ersek --- ArmVirtPkg/ArmVirtQemu.dsc | 4 ---- ArmVirtPkg/ArmVirtQemu.fdf | 4 ---- ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 ---- ArmVirtPkg/ArmVirtQemuKernel.fdf | 4 ---- 4 files changed, 16 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 32a5aa9774..10925c2bb4 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -316,11 +316,7 @@ NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf } -!if $(SECURE_BOOT_ENABLE) == TRUE - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf -!else ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf -!endif MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf # diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf index 012f65e990..422a2bf1f9 100644 --- a/ArmVirtPkg/ArmVirtQemu.fdf +++ b/ArmVirtPkg/ArmVirtQemu.fdf @@ -136,11 +136,7 @@ READ_LOCK_STATUS = TRUE 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 INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf # diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 264bd445ea..0b43832142 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -294,11 +294,7 @@ NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf } -!if $(SECURE_BOOT_ENABLE) == TRUE - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf -!else ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf -!endif MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf # diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf index 1a2652fd50..6db0668a88 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.fdf +++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf @@ -157,11 +157,7 @@ READ_LOCK_STATUS = TRUE 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 INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf #