[edk2,2/4] ArmVirtPkg/ArmVirtQemu: switch secure boot build to NorFlashDxe

Message ID 1466505034-10267-3-git-send-email-ard.biesheuvel@linaro.org
State Accepted
Commit 146961937861facc57a4428be23594102bd9cb23
Headers show

Commit Message

Ard Biesheuvel June 21, 2016, 10:30 a.m.
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 <ard.biesheuvel@linaro.org>

---
 ArmVirtPkg/ArmVirtQemu.dsc       | 4 ----
 ArmVirtPkg/ArmVirtQemu.fdf       | 4 ----
 ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 ----
 ArmVirtPkg/ArmVirtQemuKernel.fdf | 4 ----
 4 files changed, 16 deletions(-)

-- 
2.7.4

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

Comments

Laszlo Ersek June 21, 2016, 2:06 p.m. | #1
On 06/21/16 12:30, Ard Biesheuvel wrote:
> 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 <ard.biesheuvel@linaro.org>

> ---

>  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 d07593b45e27..4958b577ea06 100644

> --- a/ArmVirtPkg/ArmVirtQemu.dsc

> +++ b/ArmVirtPkg/ArmVirtQemu.dsc

> @@ -314,11 +314,7 @@ [Components.common]

>      <LibraryClasses>

>        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 012f65e99038..422a2bf1f9a1 100644

> --- a/ArmVirtPkg/ArmVirtQemu.fdf

> +++ b/ArmVirtPkg/ArmVirtQemu.fdf

> @@ -136,11 +136,7 @@ [FV.FvMain]

>  

>    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 65e6c875204f..f652689054dc 100644

> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc

> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc

> @@ -292,11 +292,7 @@ [Components.common]

>      <LibraryClasses>

>        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 1a2652fd5068..6db0668a882d 100644

> --- a/ArmVirtPkg/ArmVirtQemuKernel.fdf

> +++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf

> @@ -157,11 +157,7 @@ [FV.FvMain]

>  

>    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

>  

>    #

> 


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

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

Patch

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index d07593b45e27..4958b577ea06 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -314,11 +314,7 @@  [Components.common]
     <LibraryClasses>
       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 012f65e99038..422a2bf1f9a1 100644
--- a/ArmVirtPkg/ArmVirtQemu.fdf
+++ b/ArmVirtPkg/ArmVirtQemu.fdf
@@ -136,11 +136,7 @@  [FV.FvMain]
 
   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 65e6c875204f..f652689054dc 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -292,11 +292,7 @@  [Components.common]
     <LibraryClasses>
       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 1a2652fd5068..6db0668a882d 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.fdf
+++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf
@@ -157,11 +157,7 @@  [FV.FvMain]
 
   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
 
   #