IntelSiliconPkg/MicrocodeUpdateDxe: Error message enhancement

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemuKernel.dsc

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index df125cfef646d186cfc2e4d6c0594e2bbc96eb6e..c3e0c9bf25492b03c522b20ec620487a25009458 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -33,6 +33,7 @@
   # Defines for default states.  These can be changed on the command line.\r
   # -D FLAG=VALUE\r
   #\r
+  DEFINE TTY_TERMINAL            = FALSE\r
   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
   DEFINE NETWORK_IP6_ENABLE      = FALSE\r
   DEFINE HTTP_BOOT_ENABLE        = FALSE\r
@@ -92,13 +93,13 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE\r
 \r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE\r
+\r
 [PcdsFixedAtBuild.common]\r
-  gArmPlatformTokenSpaceGuid.PcdCoreCount|1\r
 !if $(ARCH) == AARCH64\r
   gArmTokenSpaceGuid.PcdVFPEnabled|1\r
 !endif\r
 \r
-  gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x4007c000\r
   gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x4000\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800\r
@@ -106,9 +107,6 @@
   # Size of the region used by UEFI in permanent memory (Reserved 64MB)\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000\r
 \r
-  ## Trustzone enable (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec)\r
-  gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE\r
-\r
   #\r
   # ARM PrimeCell\r
   #\r
@@ -120,6 +118,8 @@
   ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM\r
 !if $(TTY_TERMINAL) == TRUE\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4\r
+  # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID\r
+  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94}\r
 !else\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1\r
 !endif\r
@@ -142,6 +142,13 @@
   #\r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16\r
 \r
+!if $(SECURE_BOOT_ENABLE) == TRUE\r
+  # override the default values from SecurityPkg to ensure images from all sources are verified in secure boot\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x04\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdFixedMediaImageVerificationPolicy|0x04\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdRemovableMediaImageVerificationPolicy|0x04\r
+!endif\r
+\r
 [PcdsPatchableInModule.common]\r
   #\r
   # This will be overridden in the code\r
@@ -332,18 +339,14 @@
   MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
   MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
   MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
+  NetworkPkg/TcpDxe/TcpDxe.inf\r
+  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
 !if $(NETWORK_IP6_ENABLE) == TRUE\r
   NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
-  NetworkPkg/TcpDxe/TcpDxe.inf\r
   NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
   NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
   NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-!else\r
-  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
-  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
 !endif\r
 !if $(HTTP_BOOT_ENABLE) == TRUE\r
   NetworkPkg/DnsDxe/DnsDxe.inf\r