EmbeddedPkg: use central variable definitions in .vfr files

Use UefiMultiPhase.h in Vfr.vfr instead of duplicating EFI_VARIABLE_*
definitions.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

diff --git a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr
index a1e603abf0cee272771ccce339fdb147e818526c..725fbf52a56f99a9ff5da4467cbf5c5895f7e1e8 100644 (file)
--- a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr
+++ b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr
@@ -12,16 +12,9 @@
 *\r
 **/\r
 \r
+#include <Uefi/UefiMultiPhase.h>\r
 #include "ConsolePrefDxe.h"\r
 \r
-//\r
-// EFI Variable attributes\r
-//\r
-#define EFI_VARIABLE_NON_VOLATILE       0x00000001\r
-#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002\r
-#define EFI_VARIABLE_RUNTIME_ACCESS     0x00000004\r
-#define EFI_VARIABLE_READ_ONLY          0x00000008\r
-\r
 formset\r
   guid      = CONSOLE_PREF_FORMSET_GUID,\r
   title     = STRING_TOKEN(STR_FORM_SET_TITLE),\r

diff --git a/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr b/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr
index 3516746c4d84fdd652f629177ce098cc96c749fd..80c6f36425bf1f14c2881a5d8a69d9bd1a1ffdf8 100644 (file)
--- a/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr
+++ b/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr
@@ -12,16 +12,9 @@
 *\r
 **/\r
 \r
+#include <Uefi/UefiMultiPhase.h>\r
 #include "DtPlatformDxe.h"\r
 \r
-//\r
-// EFI Variable attributes\r
-//\r
-#define EFI_VARIABLE_NON_VOLATILE       0x00000001\r
-#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002\r
-#define EFI_VARIABLE_RUNTIME_ACCESS     0x00000004\r
-#define EFI_VARIABLE_READ_ONLY          0x00000008\r
-\r
 formset\r
   guid      = DT_PLATFORM_FORMSET_GUID,\r
   title     = STRING_TOKEN(STR_FORM_SET_TITLE),\r