The set of variable attribute definitions in <Uefi/UefiMultiPhase.h> is
used by C code, but VfrCompile does not seem happy with parts of that
header file.

Long-term, this should probably be fixed in VfrCompile, but a simple
solution for now is to conditionalise the complicating segments of
UefiMultiPhase.h on !VFRCOMPILE and include this directly in .vfr source.                             

v1 -> v2:
Instead of breaking parts of UefiMultiPhase.h out into a new header,
conditionalise the problematic bits on !VFRCOMPILE.

Leaving out the reviewed-bys on 2/3 since the underlying mechanism
changes...

Leif Lindholm (3):
  MdePkg: restrict UefiMultiPhase.h contents if VFRCOMPILE defined
  MdeModulePkg: use central variable definitions in DriverSampleDxe
  EmbeddedPkg: use central variable definitions in .vfr files

 EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr |  9 +---
 EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr   |  9 +---
 MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr        |  9 +---
 MdePkg/Include/Uefi/UefiMultiPhase.h                  | 44 ++++++++++----------
 4 files changed, 26 insertions(+), 45 deletions(-)

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>            
-- 
2.11.0
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel