BaseTools/BinToPcd: Fix Python 2.7.x compatibility issue

[mirror_edk2.git] / ArmVirtPkg / ArmVirtPkg.dec

diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec
index 7bbd9fff570e18b4d20504a40066d28473a99f14..8f656fd2739dd1460891029f53953c765396f8fb 100644 (file)
--- a/ArmVirtPkg/ArmVirtPkg.dec
+++ b/ArmVirtPkg/ArmVirtPkg.dec
@@ -30,10 +30,18 @@
 [Includes.common]\r
   Include                        # Root include for the package\r
 \r
+[LibraryClasses]\r
+  ArmVirtMemInfoLib|Include/Library/ArmVirtMemInfoLib.h\r
+\r
 [Guids.common]\r
   gArmVirtTokenSpaceGuid = { 0x0B6F5CA7, 0x4F53, 0x445A, { 0xB7, 0x6E, 0x2E, 0x36, 0x5B, 0x80, 0x63, 0x66 } }\r
   gEarlyPL011BaseAddressGuid       = { 0xB199DEA9, 0xFD5C, 0x4A84, { 0x80, 0x82, 0x2F, 0x41, 0x70, 0x78, 0x03, 0x05 } }\r
 \r
+  gArmVirtVariableGuid   = { 0x50bea1e5, 0xa2c5, 0x46e9, { 0x9b, 0x3a, 0x59, 0x59, 0x65, 0x16, 0xb0, 0x0a } }\r
+\r
+[Protocols]\r
+  gFdtClientProtocolGuid = { 0xE11FACA0, 0x4710, 0x4C8E, { 0xA7, 0xA2, 0x01, 0xBA, 0xA2, 0x59, 0x1B, 0x4C } }\r
+\r
 [PcdsFixedAtBuild, PcdsPatchableInModule]\r
   #\r
   # This is the physical address where the device tree is expected to be stored\r
@@ -49,39 +57,16 @@
   #\r
   gArmVirtTokenSpaceGuid.PcdDeviceTreeAllocationPadding|256|UINT32|0x00000002\r
 \r
-[PcdsDynamic, PcdsFixedAtBuild]\r
   #\r
-  # ARM PSCI function invocations can be done either through hypervisor\r
-  # calls (HVC) or secure monitor calls (SMC).\r
-  # PcdArmPsciMethod == 1 : use HVC\r
-  # PcdArmPsciMethod == 2 : use SMC\r
+  # Binary representation of the GUID that determines the terminal type. The\r
+  # size must be exactly 16 bytes. The default value corresponds to\r
+  # EFI_VT_100_GUID.\r
   #\r
-  gArmVirtTokenSpaceGuid.PcdArmPsciMethod|0|UINT32|0x00000003\r
-\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0|UINT64|0x00000004\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0|UINT64|0x00000005\r
+  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x65, 0x60, 0xA6, 0xDF, 0x19, 0xB4, 0xD3, 0x11, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D}|VOID*|0x00000007\r
 \r
-[PcdsFeatureFlag]\r
-  #\r
-  # "Map PCI MMIO as Cached"\r
-  #\r
-  # Due to the way Stage1 and Stage2 mappings are combined on Aarch64, and\r
-  # because KVM -- for the time being -- does not try to interfere with the\r
-  # Stage1 mappings, we must not set EFI_MEMORY_UC for emulated PCI MMIO\r
-  # regions.\r
-  #\r
-  # EFI_MEMORY_UC is mapped to Device-nGnRnE, and that Stage1 attribute would\r
-  # direct guest writes to host DRAM immediately, bypassing the cache\r
-  # regardless of Stage2 attributes. However, QEMU's reads of the same range\r
-  # can easily be served from the (stale) CPU cache.\r
-  #\r
-  # Setting this PCD to TRUE will use EFI_MEMORY_WB for mapping PCI MMIO\r
-  # regions, which ensures that guest writes to such regions go through the CPU\r
-  # cache. Strictly speaking this is wrong, but it is needed as a temporary\r
-  # workaround for emulated PCI devices. Setting the PCD to FALSE results in\r
-  # the theoretically correct EFI_MEMORY_UC mapping, and should be the long\r
-  # term choice, especially with assigned devices.\r
+[PcdsDynamic]\r
   #\r
-  # The default is to turn off the kludge; DSC's can selectively enable it.\r
+  # Whether to force disable ACPI, regardless of the fw_cfg settings\r
+  # exposed by QEMU\r
   #\r
-  gArmVirtTokenSpaceGuid.PcdKludgeMapPciMmioAsCached|FALSE|BOOLEAN|0x00000006\r
+  gArmVirtTokenSpaceGuid.PcdForceNoAcpi|0x0|BOOLEAN|0x00000003\r