MdeModulePkg/Logo:Add RISCV64 architecture

[mirror_edk2.git] / ArmVirtPkg / ArmVirt.dsc.inc

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index 20bf011617a121fbc405f3371ffdecc17c564ea1..cf44fc73890b7cbfe58f1ad4f6408aeeb9837a09 100644 (file)
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -10,6 +10,21 @@
 [Defines]\r
   DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x8000004F\r
 \r
+!if $(TARGET) != NOOPT\r
+  DEFINE FD_SIZE_IN_MB    = 2\r
+!else\r
+  DEFINE FD_SIZE_IN_MB    = 3\r
+!endif\r
+\r
+!if $(FD_SIZE_IN_MB) == 2\r
+  DEFINE FD_SIZE          = 0x200000\r
+  DEFINE FD_NUM_BLOCKS    = 0x200\r
+!endif\r
+!if $(FD_SIZE_IN_MB) == 3\r
+  DEFINE FD_SIZE          = 0x300000\r
+  DEFINE FD_NUM_BLOCKS    = 0x300\r
+!endif\r
+\r
 [BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
 \r
@@ -71,6 +86,9 @@
 \r
   # Networking Requirements\r
 !include NetworkPkg/NetworkLibs.dsc.inc\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
+  TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf\r
+!endif\r
 \r
 \r
   #\r
@@ -136,20 +154,22 @@
   # CryptoPkg libraries needed by multiple firmware features\r
   #\r
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
+  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
+!else\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf\r
+!endif\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
 \r
   #\r
   # Secure Boot dependencies\r
   #\r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
-  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf\r
   AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf\r
 \r
   # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree\r
   PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf\r
 !else\r
-  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf\r
   AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf\r
 !endif\r
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf\r
@@ -357,6 +377,10 @@
     <PcdsFixedAtBuild>\r
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
   }\r
+  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {\r
+    <PcdsFixedAtBuild>\r
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
+  }\r
   ShellPkg/Application/Shell/Shell.inf {\r
     <LibraryClasses>\r
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf\r