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>
---
 EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr | 9 +--------
 EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr   | 9 +--------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr
index a1e603abf0..725fbf52a5 100644
--- a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr
+++ b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr
@@ -12,16 +12,9 @@
 *
 **/
 
+#include <Uefi/UefiMultiPhase.h>
 #include "ConsolePrefDxe.h"
 
-//
-// EFI Variable attributes
-//
-#define EFI_VARIABLE_NON_VOLATILE       0x00000001
-#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002
-#define EFI_VARIABLE_RUNTIME_ACCESS     0x00000004
-#define EFI_VARIABLE_READ_ONLY          0x00000008
-
 formset
   guid      = CONSOLE_PREF_FORMSET_GUID,
   title     = STRING_TOKEN(STR_FORM_SET_TITLE),
diff --git a/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr b/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr
index 3516746c4d..80c6f36425 100644
--- a/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr
+++ b/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr
@@ -12,16 +12,9 @@
 *
 **/
 
+#include <Uefi/UefiMultiPhase.h>
 #include "DtPlatformDxe.h"
 
-//
-// EFI Variable attributes
-//
-#define EFI_VARIABLE_NON_VOLATILE       0x00000001
-#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002
-#define EFI_VARIABLE_RUNTIME_ACCESS     0x00000004
-#define EFI_VARIABLE_READ_ONLY          0x00000008
-
 formset
   guid      = DT_PLATFORM_FORMSET_GUID,
   title     = STRING_TOKEN(STR_FORM_SET_TITLE),
-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

On 15 December 2017 at 16:59, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> 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>

> ---
>  EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr | 9 +--------
>  EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr   | 9 +--------
>  2 files changed, 2 insertions(+), 16 deletions(-)
>
> diff --git a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr
> index a1e603abf0..725fbf52a5 100644
> --- a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr
> +++ b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr
> @@ -12,16 +12,9 @@
>  *
>  **/
>
> +#include <Uefi/UefiMultiPhase.h>
>  #include "ConsolePrefDxe.h"
>
> -//
> -// EFI Variable attributes
> -//
> -#define EFI_VARIABLE_NON_VOLATILE       0x00000001
> -#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002
> -#define EFI_VARIABLE_RUNTIME_ACCESS     0x00000004
> -#define EFI_VARIABLE_READ_ONLY          0x00000008
> -
>  formset
>    guid      = CONSOLE_PREF_FORMSET_GUID,
>    title     = STRING_TOKEN(STR_FORM_SET_TITLE),
> diff --git a/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr b/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr
> index 3516746c4d..80c6f36425 100644
> --- a/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr
> +++ b/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr
> @@ -12,16 +12,9 @@
>  *
>  **/
>
> +#include <Uefi/UefiMultiPhase.h>
>  #include "DtPlatformDxe.h"
>
> -//
> -// EFI Variable attributes
> -//
> -#define EFI_VARIABLE_NON_VOLATILE       0x00000001
> -#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002
> -#define EFI_VARIABLE_RUNTIME_ACCESS     0x00000004
> -#define EFI_VARIABLE_READ_ONLY          0x00000008
> -
>  formset
>    guid      = DT_PLATFORM_FORMSET_GUID,
>    title     = STRING_TOKEN(STR_FORM_SET_TITLE),
> --
> 2.11.0
>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel