ArmVirtualizationPkg: expose debug message bitmask on build command line

This enables -D DEBUG_PRINT_ERROR_LEVEL=0x8040004F style command line
options.

Since we're massaging the debug message bitmask anyway, let's update the
description of the individual bits too in the comments, so that they match
"MdePkg/Include/Library/DebugLib.h".

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16986 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc
index 565f243091a47cb56ac67a2c3099fab26c2755d1..4e30e9f3818a49171c0e5238a89241335965059e 100644 (file)
--- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc
@@ -12,6 +12,9 @@
 #\r
 #\r
 \r
+[Defines]\r
+  DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x8000004F\r
+\r
 [LibraryClasses.common]\r
 !if $(TARGET) == RELEASE\r
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
@@ -277,8 +280,8 @@
   #  DEBUG_FS        0x00000008  // EFI File system\r
   #  DEBUG_POOL      0x00000010  // Alloc & Free's\r
   #  DEBUG_PAGE      0x00000020  // Alloc & Free's\r
-  #  DEBUG_INFO      0x00000040  // Verbose\r
-  #  DEBUG_DISPATCH  0x00000080  // PEI/DXE Dispatchers\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
@@ -288,8 +291,10 @@
   #  DEBUG_EVENT     0x00080000  // Event messages\r
   #  DEBUG_GCD       0x00100000  // Global Coherency Database changes\r
   #  DEBUG_CACHE     0x00200000  // Memory range cachability changes\r
+  #  DEBUG_VERBOSE   0x00400000  // Detailed debug messages that may\r
+  #                              // significantly impact boot performance\r
   #  DEBUG_ERROR     0x80000000  // Error\r
-  # gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000000F\r
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|$(DEBUG_PRINT_ERROR_LEVEL)\r
 \r
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07\r
 \r

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
index 2fd641fb65e3f7937c6704a43b04e2a925e8ba42..0f064af1b5475a8f165cde32b31fe962fbcc5485 100644 (file)
--- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
@@ -91,8 +91,6 @@
   gArmVirtualizationTokenSpaceGuid.PcdKludgeMapPciMmioAsCached|TRUE\r
 \r
 [PcdsFixedAtBuild.common]\r
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F\r
-\r
   gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"QEMU"\r
 \r
   gArmPlatformTokenSpaceGuid.PcdCoreCount|1\r

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc
index 81b836978b6a2d24f36853b367ac32bc0324571a..9cc926c382189958ec0c927a1d1a85739822f888 100644 (file)
--- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc
@@ -79,8 +79,6 @@
 ################################################################################\r
 \r
 [PcdsFixedAtBuild.common]\r
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F\r
-\r
   gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"XEN-UEFI"\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"\r
 \r