ArmPkg: remove unused PcdArmUncachedMemoryMask PCD

This removes the PCD PcdArmUncachedMemoryMask from ArmPkg, along with
any remaining references to it in various platform .DSC files. It is
no longer used now that we removed the virtual uncached pages protocol
and the associated DebugUncachedMemoryAllocationLib library instance.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index 4fd7a5be51584eb984e7cf970108f572ff661716..c4b4da2f95bb3b02200cd3a4caec2e3ecacccc69 100644 (file)
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -84,7 +84,6 @@
   # Using a FeaturePcd make a '(BOOLEAN) casting for its value which is not understood by the preprocessor.\r
   gArmTokenSpaceGuid.PcdVFPEnabled|0|UINT32|0x00000024\r
 \r
   # Using a FeaturePcd make a '(BOOLEAN) casting for its value which is not understood by the preprocessor.\r
   gArmTokenSpaceGuid.PcdVFPEnabled|0|UINT32|0x00000024\r
 \r

-  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000080000000|UINT64|0x00000002\r

   # This PCD will free the unallocated buffers if their size reach this threshold.\r
   # We set the default value to 512MB.\r
   gArmTokenSpaceGuid.PcdArmFreeUncachedMemorySizeThreshold|0x20000000|UINT64|0x00000003\r
   # This PCD will free the unallocated buffers if their size reach this threshold.\r
   # We set the default value to 512MB.\r
   gArmTokenSpaceGuid.PcdArmFreeUncachedMemorySizeThreshold|0x20000000|UINT64|0x00000003\r

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index cc09d38910a2bb50abc226f271d4968ef33fa7a1..d40ea69b072dc3c32f9cb0bbf9fed0426767ac00 100644 (file)
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -360,11 +360,6 @@
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20\r
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0\r
 \r
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20\r
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0\r
 \r

-  #\r
-  # ARM Pcds\r
-  #\r
-  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000000000000\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
 !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

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 8fe3c3816961207cd59ef9e8a76c6e00ffa3da92..00cdd7c20201b77f4615b62c5bb8c1756ea924c9 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -113,11 +113,6 @@
   # Size of the region used by UEFI in permanent memory (Reserved 64MB)\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000\r
 \r
   # Size of the region used by UEFI in permanent memory (Reserved 64MB)\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000\r
 \r

-  #\r
-  # ARM Pcds\r
-  #\r
-  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000\r
-\r

   ## Trustzone enable (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec)\r
   gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE\r
 \r
   ## Trustzone enable (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec)\r
   gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE\r
 \r

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index aa40374745afbfbce2eddbdc77850b83a27f6c14..8354b13ddb1a07ff8fa0e8cd61d648baba3a72df 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -113,11 +113,6 @@
   # Size of the region used by UEFI in permanent memory (Reserved 64MB)\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000\r
 \r
   # Size of the region used by UEFI in permanent memory (Reserved 64MB)\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000\r
 \r

-  #\r
-  # ARM Pcds\r
-  #\r
-  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000\r
-\r

   ## Trustzone enable (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec)\r
   gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE\r
 \r
   ## Trustzone enable (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec)\r
   gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE\r
 \r

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index a71a01ac77233639c8885659b05f3230dc161b48..87879c33fcd98794162186beecb6d27952e5e8e7 100644 (file)
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -368,11 +368,6 @@
   # Shell.\r
   gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
 \r
   # Shell.\r
   gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
 \r

-  #\r
-  # ARM Pcds\r
-  #\r
-  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000\r
-\r

   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10\r
 \r
   # GUID of the UEFI Shell\r
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10\r
 \r
   # GUID of the UEFI Shell\r

diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc
index ad7d9898c330423605270055edd5e974847941d2..fc94ca7ed1291d859405b92a83930cb6600d9bb8 100644 (file)
--- a/Omap35xxPkg/Omap35xxPkg.dsc
+++ b/Omap35xxPkg/Omap35xxPkg.dsc
@@ -162,11 +162,6 @@
   # OMAP Interrupt Controller\r
   gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x48200000\r
 \r
   # OMAP Interrupt Controller\r
   gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x48200000\r
 \r

-  #\r
-  # ARM Pcds\r
-  #\r
-  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000\r
-\r

 ################################################################################\r
 #\r
 # Components Section - list of all EDK II Modules needed by this Platform\r
 ################################################################################\r
 #\r
 # Components Section - list of all EDK II Modules needed by this Platform\r