]> git.proxmox.com Git - mirror_edk2.git/commit - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c
ArmPlatformPkg/NorFlashDxe: accept both non-secure and secure varstore GUIDs
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Tue, 21 Jun 2016 09:57:48 +0000 (11:57 +0200)
committerArd Biesheuvel <ard.biesheuvel@linaro.org>
Wed, 22 Jun 2016 14:52:40 +0000 (16:52 +0200)
commit8753858f84768fa6fa17191b86c97538457723ce
tree1549d0b60395abd4f1a89923e5878da291224df2
parent5e90aa1e207344723b28dd87bb5af14a0a775494
ArmPlatformPkg/NorFlashDxe: accept both non-secure and secure varstore GUIDs

Now that the generic Variable Runtime DXE code no longer distinguishes
between gEfiVariableGuid and gEfiAuthenticatedVariableGuid in the varstore
FV header, we can relax the check in the NOR flash driver to accept either
GUID regardless of whether we are running a secure boot capable build or not.

This also means we can always use gEfiAuthenticatedVariableGuid when we
encounter an empty NOR flash that needs to be initialized before use. So
remove the mNorFlashVariableGuid global from the shared code and from both
versions of NorFlashDxe.inf. This essentially collapses the two drivers into
a single one, which means we can remove NorFlashAuthenticatedDxe entirely
in a subsequent patch.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf
ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedVariableDep.c [deleted file]
ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h
ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c
ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashVariableDep.c [deleted file]