NetworkPkg: Revert git 'eb213f2f' fix

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

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index b45d9d09d0dc0b061673caf324e2cc205111b364..5938cb4ebfcb3f1d953e08e06d8213603ed0a06f 100644 (file)
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -20,6 +20,7 @@
 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]\r
   GCC:*_*_ARM_DLINK_FLAGS = -z common-page-size=0x1000\r
   GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000\r
+  RVCT:*_*_ARM_DLINK_FLAGS = --scatter $(EDK_TOOLS_PATH)/Scripts/Rvct-Align4K.sct\r
 \r
 [LibraryClasses.common]\r
 !if $(TARGET) == RELEASE\r
@@ -233,6 +234,9 @@
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf\r
 !endif\r
 \r
+[LibraryClasses.ARM]\r
+  ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf\r
+\r
 [BuildOptions]\r
   RVCT:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG\r
 \r
@@ -297,16 +301,16 @@
   #  DEBUG_WARN      0x00000002  // Warnings\r
   #  DEBUG_LOAD      0x00000004  // Load events\r
   #  DEBUG_FS        0x00000008  // EFI File system\r
-  #  DEBUG_POOL      0x00000010  // Alloc & Free's\r
-  #  DEBUG_PAGE      0x00000020  // Alloc & Free's\r
+  #  DEBUG_POOL      0x00000010  // Alloc & Free (pool)\r
+  #  DEBUG_PAGE      0x00000020  // Alloc & Free (page)\r
   #  DEBUG_INFO      0x00000040  // Informational debug messages\r
   #  DEBUG_DISPATCH  0x00000080  // PEI/DXE/SMM Dispatchers\r
   #  DEBUG_VARIABLE  0x00000100  // Variable\r
   #  DEBUG_BM        0x00000400  // Boot Manager\r
   #  DEBUG_BLKIO     0x00001000  // BlkIo Driver\r
-  #  DEBUG_NET       0x00004000  // SNI Driver\r
+  #  DEBUG_NET       0x00004000  // SNP Driver\r
   #  DEBUG_UNDI      0x00010000  // UNDI Driver\r
-  #  DEBUG_LOADFILE  0x00020000  // UNDI Driver\r
+  #  DEBUG_LOADFILE  0x00020000  // LoadFile\r
   #  DEBUG_EVENT     0x00080000  // Event messages\r
   #  DEBUG_GCD       0x00100000  // Global Coherency Database changes\r
   #  DEBUG_CACHE     0x00200000  // Memory range cachability changes\r