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.

For now, 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.

https://bugzilla.tianocore.org/show_bug.cgi?id=878 has been raised to
request VfrCompile is extended to support the original format.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

1 files 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