On 30 June 2015 at 11:01, Star Zeng <star.z...@intel.com> wrote:
> Remove gVariableAuthenticatedRuntimeDxeFileGuid definition in
> ArmPlatformPkg.dec and use gVariableRuntimeDxeFileGuid in
> NorFlashAuthenticatedDxe.inf as auth Variable driver in SecurityPkg
> and Variable driver in MdeModulePkg have been merged.
>
> Cc: Olivier Martin <olivier.mar...@arm.com>
> Cc: Leif Lindholm <leif.lindh...@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Star Zeng <star.z...@intel.com>
Reviewed-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
As I mentioned before, I will try to merge
NorFlashAuthenticatedDxe.inf again with NorFlashDxe.inf (I only split
them a couple of weeks ago) but it can wait. No need to worry about it
here.
--
Ard.
> ---
> ArmPlatformPkg/ArmPlatformPkg.dec | 5 +----
> ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf | 5 +++--
> 2 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec
> b/ArmPlatformPkg/ArmPlatformPkg.dec
> index 4100b15..cd67aee 100644
> --- a/ArmPlatformPkg/ArmPlatformPkg.dec
> +++ b/ArmPlatformPkg/ArmPlatformPkg.dec
> @@ -1,6 +1,7 @@
> #/** @file
> #
> # Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> +# Copyright (c) 2015, Intel Corporation. All rights reserved.
> #
> # This program and the accompanying materials
> # are licensed and made available under the terms and conditions of the BSD
> License
> @@ -36,10 +37,6 @@ [Guids.common]
> # Following Guid must match FILE_GUID in
> MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
> #
> gVariableRuntimeDxeFileGuid = { 0xcbd2e4d5, 0x7068, 0x4ff5, { 0xb4, 0x62,
> 0x98, 0x22, 0xb4, 0xad, 0x8d, 0x60 } }
> - #
> - # Following Guid must match FILE_GUID in
> SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf
> - #
> - gVariableAuthenticatedRuntimeDxeFileGuid = { 0x2226f30f, 0x3d5b, 0x402d,
> {0x99, 0x36, 0xa9, 0x71, 0x84, 0xEB, 0x45, 0x16 } }
>
> ## Include/Guid/ArmGlobalVariableHob.h
> gArmGlobalVariableGuid = { 0xc3253c90, 0xa24f, 0x4599, { 0xa6, 0x64,
> 0x1f, 0x88, 0x13, 0x77, 0x8f, 0xc9} }
> diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf
> b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf
> index ff8f048..6c5e6ae 100644
> --- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf
> +++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf
> @@ -4,6 +4,7 @@
> #
> # Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
> # Copyright (c) 2015, Linaro Ltd. All rights reserved.<BR>
> +# Copyright (c) 2015, Intel Corporation. All rights reserved.
> #
> # This program and the accompanying materials
> # are licensed and made available under the terms and conditions of the BSD
> License
> @@ -70,7 +71,7 @@ [Pcd.common]
>
> [Depex]
> #
> - # NorFlashAuthenticatedDxe must be loaded before
> VariableAuthenticatedRuntimeDxe
> + # NorFlashAuthenticatedDxe must be loaded before VariableRuntimeDxe
> # in case empty flash needs populating with default values
> #
> - BEFORE gVariableAuthenticatedRuntimeDxeFileGuid
> + BEFORE gVariableRuntimeDxeFileGuid
> --
> 1.9.5.msysgit.0
>
>
> ------------------------------------------------------------------------------
> Don't Limit Your Business. Reach for the Cloud.
> GigeNET's Cloud Solutions provide you with the tools and support that
> you need to offload your IT needs and focus on growing your business.
> Configured For All Businesses. Start Your Cloud Today.
> https://www.gigenetcloud.com/
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/edk2-devel
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel
