Hi Star, I lost track of this one during my sabbatical until Ard's patch earlier today jogged my memory.
On Sun, Dec 17, 2017 at 11:23:10AM +0000, Zeng, Star wrote: > You may submit a bugzilla for the long term approach as Liming > suggested in V1 patch series, and then add the bug link in this > commit log? I have raised https://bugzilla.tianocore.org/show_bug.cgi?id=878 for the enhancement. Are you OK with the patch as below (it rebases cleanly to current master) if I add the paragraph: --- https://bugzilla.tianocore.org/show_bug.cgi?id=878 has been raised to request VfrCompile is extended to support the original format. --- to the end of the commit message? Regards, Leif > > > > Thanks, > Star > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Leif > Lindholm > Sent: Saturday, December 16, 2017 12:59 AM > To: edk2-devel@lists.01.org > Cc: Kinney, Michael D <michael.d.kin...@intel.com>; Gao, Liming > <liming....@intel.com> > Subject: [edk2] [PATCH v2 1/3] MdePkg: restrict UefiMultiPhase.h contents if > VFRCOMPILE defined > > Turns out all .vfr files in the tree interacting with DynamicPcds manually > copy the same set of EFI_VARIABLE_* definitions, since the rest of > UefiMultiPhase.h is incompatible with VfrCompile. > > Instead, reshuffle these definitions to the start of the file, and put the > rest of the file behind #ifndef VFRCOMPILE to permit direct inclusion in .vfr > source files. > > Cc: Michael D Kinney <michael.d.kin...@intel.com> > Cc: Liming Gao <liming....@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Leif Lindholm <leif.lindh...@linaro.org> > --- > MdePkg/Include/Uefi/UefiMultiPhase.h | 44 ++++++++++---------- > 1 file changed, 23 insertions(+), 21 deletions(-) > > diff --git a/MdePkg/Include/Uefi/UefiMultiPhase.h > b/MdePkg/Include/Uefi/UefiMultiPhase.h > index 0dcbb1b9ee..67ecc4c27c 100644 > --- a/MdePkg/Include/Uefi/UefiMultiPhase.h > +++ b/MdePkg/Include/Uefi/UefiMultiPhase.h > @@ -15,6 +15,28 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > EXPRESS OR IMPLIED. > #ifndef __UEFI_MULTIPHASE_H__ > #define __UEFI_MULTIPHASE_H__ > > +/// > +/// Attributes of variable. > +/// > +#define EFI_VARIABLE_NON_VOLATILE 0x00000001 > +#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002 > +#define EFI_VARIABLE_RUNTIME_ACCESS 0x00000004 > +/// > +/// This attribute is identified by the mnemonic 'HR' > +/// elsewhere in this specification. > +/// > +#define EFI_VARIABLE_HARDWARE_ERROR_RECORD 0x00000008 > +/// > +/// Attributes of Authenticated Variable /// > +#define EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS 0x00000020 > +#define EFI_VARIABLE_APPEND_WRITE 0x00000040 > +/// > +/// NOTE: EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS is deprecated and should > be considered reserved. > +/// > +#define EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS 0x00000010 > + > +#ifndef VFRCOMPILE > #include <Guid/WinCertificate.h> > /// > /// Enumeration of memory types introduced in UEFI. > @@ -156,27 +178,6 @@ typedef struct { > } EFI_TABLE_HEADER; > > /// > -/// Attributes of variable. > -/// > -#define EFI_VARIABLE_NON_VOLATILE 0x00000001 > -#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002 > -#define EFI_VARIABLE_RUNTIME_ACCESS 0x00000004 > -/// > -/// This attribute is identified by the mnemonic 'HR' > -/// elsewhere in this specification. > -/// > -#define EFI_VARIABLE_HARDWARE_ERROR_RECORD 0x00000008 > -/// > -/// Attributes of Authenticated Variable -/// > -#define EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS 0x00000020 > -#define EFI_VARIABLE_APPEND_WRITE 0x00000040 > -/// > -/// NOTE: EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS is deprecated and should > be considered reserved. > -/// > -#define EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS 0x00000010 > - > -/// > /// AuthInfo is a WIN_CERTIFICATE using the wCertificateType /// > WIN_CERTIFICATE_UEFI_GUID and the CertType /// > EFI_CERT_TYPE_RSA2048_SHA256_GUID. If the attribute specifies @@ -229,5 > +230,6 @@ typedef struct { > /// > WIN_CERTIFICATE_UEFI_GUID AuthInfo; > } EFI_VARIABLE_AUTHENTICATION_2; > +#endif // VFRCOMPILE > > #endif > -- > 2.11.0 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
