Platform Silicon: remove obsolete ArmPlatformPkg PCD assignments

Remove unused ArmPlatformPkg PCDs from all platform descriptions.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

17 files changed, 0 insertions, 134 deletions

diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc
index e7cb280ff3..5c2a29fe83 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.dsc
+++ b/Platform/ARM/JunoPkg/ArmJuno.dsc
@@ -85,8 +85,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE

 

 [PcdsFixedAtBuild.common]

-  gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Juno"

-

   #

   # NV Storage PCDs. Use base of 0x08000000 for NOR0

   #

@@ -160,17 +158,6 @@
   gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)"

 

   #

-  # ARM OS Loader

-  #

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from NOR Flash"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/Image"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"console=ttyAMA0,115200 earlycon=pl011,0x7ff80000 root=/dev/sda1 rootwait verbose debug"

-

-  # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)

-  gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E25FDD51EF94)"

-  gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E25FDD51EF94)"

-

-  #

   # ARM Architectural Timer Frequency

   #

   gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|50000000

diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
index 7da336fbd8..ab154da43e 100644
--- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
+++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
@@ -73,9 +73,6 @@
 

   gArmJunoTokenSpaceGuid.PcdJunoFdtDevicePath

 

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument

-

   # PCI Root complex specific PCDs

   gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress

   gArmTokenSpaceGuid.PcdPciBusMin

diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
index 45f7f0f7ea..1f612cc282 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
@@ -109,19 +109,6 @@
 

   gArmTokenSpaceGuid.PcdVFPEnabled|1

 

-  # Stacks for MPCores in Secure World

-  # SRAM (CS1) is only available between 0x14000000 and 0x14001000 on the model

-  # ZBT SRAM is available between 0x2E000000 and 0x2E010000 on the model

-!ifdef ARM_BIGLITTLE_TC2

-  gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0x17000000

-!else

-  gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0x2E000000

-!endif

-  gArmPlatformTokenSpaceGuid.PcdCPUCoreSecPrimaryStackSize|0x8000

-  gArmPlatformTokenSpaceGuid.PcdCPUCoreSecSecondaryStackSize|0x1000

-  # Share Monitor stacks with Secure World

-  gArmPlatformTokenSpaceGuid.PcdCPUCoreSecMonStackSize|0

-

   # System Memory (1GB) - An additional 1GB will be added if UEFI is running on a 2GB Test Chip

   gArmTokenSpaceGuid.PcdSystemMemoryBase|0x80000000

   gArmTokenSpaceGuid.PcdSystemMemorySize|0x40000000

diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
index c4fd9124df..3dbc105f6f 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
@@ -85,8 +85,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE

 

 [PcdsFixedAtBuild.common]

-  gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Fixed Virtual Platform"

-

   # Only one core enters UEFI, and PSCI is implemented in EL3 by ATF

   gArmPlatformTokenSpaceGuid.PcdCoreCount|1

 

@@ -156,21 +154,6 @@
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C000000

 

   #

-  # ARM OS Loader

-  #

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from SemiHosting"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/Image"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 loglevel=9"

-

-  # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)

-!ifdef EDK2_ENABLE_PL111

-  gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E25FDD51EF94);VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)"

-!else

-  gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E25FDD51EF94)"

-!endif

-  gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E25FDD51EF94)"

-

-  #

   # ARM Architectural Timer Frequency

   #

   # Set tick frequency value to 100Mhz

diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
index 20552ef1a0..717f7332c9 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -284,7 +284,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwarePerformanceDataTableS3Support|FALSE

 

 [PcdsFixedAtBuild.common]

-  gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express"

 !ifdef $(FIRMWARE_VER)

   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"

 !endif

@@ -369,15 +368,6 @@
   # List of Device Paths that support BootMonFs

   gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59);VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)"

 

-  #

-  # ARM OS Loader

-  #

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from NorFlash"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/Image"

-

-  # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)

-  gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(CE660500-824D-11E0-AC72-0002A5D5C51B)"

-  gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi()"

   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10

 

   # RunAxf support via Dynamic Shell Command protocol

diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
index 2322ee6a2c..4cbd2ff4b4 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
@@ -47,7 +47,6 @@
 

 [FeaturePcd]

   gEmbeddedTokenSpaceGuid.PcdCacheEnable

-  gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping

 

 [FixedPcd]

   gArmTokenSpaceGuid.PcdSystemMemoryBase

diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf
index e659f44ad2..269760f8ba 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf
@@ -43,7 +43,6 @@
 

 [FeaturePcd]

   gEmbeddedTokenSpaceGuid.PcdCacheEnable

-  gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping

 

 [FixedPcd]

   gArmTokenSpaceGuid.PcdSystemMemoryBase

diff --git a/Platform/Hisilicon/D02/Pv660D02.dsc b/Platform/Hisilicon/D02/Pv660D02.dsc
index a2a94945e5..9e826aeb60 100644
--- a/Platform/Hisilicon/D02/Pv660D02.dsc
+++ b/Platform/Hisilicon/D02/Pv660D02.dsc
@@ -102,14 +102,6 @@
 

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000

 

-  # Stacks for MPCores in Secure World

-  gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0xE1000000

-  gArmPlatformTokenSpaceGuid.PcdCPUCoreSecPrimaryStackSize|0x10000

-

-  # Stacks for MPCores in Monitor Mode

-  gArmPlatformTokenSpaceGuid.PcdCPUCoresSecMonStackBase|0xE100FF00

-  gArmPlatformTokenSpaceGuid.PcdCPUCoreSecMonStackSize|0x100

-

   # Stacks for MPCores in Normal World

   gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0xE1000000

   gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0xFF00

@@ -162,18 +154,6 @@
   gHisiTokenSpaceGuid.PcdNORFlashCachableSize|0x8000000

 

   #

-  # ARM OS Loader

-  #

-  # Versatile Express machine type (ARM VERSATILE EXPRESS = 2272) required for ARM Linux:

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from SATA"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"EFI\GRUB2\grubaa64.efi"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|""

-

-  # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)

-  gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)"

-  gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"

-

-  #

   # ARM Architectual Timer Frequency

   #

   gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|50000000

diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc
index d37c370648..b434f6854a 100644
--- a/Platform/Hisilicon/D03/D03.dsc
+++ b/Platform/Hisilicon/D03/D03.dsc
@@ -112,14 +112,6 @@
 

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000

 

-  # Stacks for MPCores in Secure World

-  gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0x81000000

-  gArmPlatformTokenSpaceGuid.PcdCPUCoreSecPrimaryStackSize|0x10000

-

-  # Stacks for MPCores in Monitor Mode

-  gArmPlatformTokenSpaceGuid.PcdCPUCoresSecMonStackBase|0x8100FF00

-  gArmPlatformTokenSpaceGuid.PcdCPUCoreSecMonStackSize|0x100

-

   # Stacks for MPCores in Normal World

   gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x81000000

   gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0xFF00

@@ -187,18 +179,6 @@
   gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x4D100000

 

   #

-  # ARM OS Loader

-  #

-  # Versatile Express machine type (ARM VERSATILE EXPRESS = 2272) required for ARM Linux:

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from SATA"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"EFI\GRUB2\grubaa64.efi"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|""

-

-  # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)

-  gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)"

-  gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"

-

-  #

   # ARM Architectual Timer Frequency

   #

   # Set it to 0 so that the code will read frequence from register and be

diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
index 1574c3feef..77a89fd8e1 100644
--- a/Platform/Hisilicon/D05/D05.dsc
+++ b/Platform/Hisilicon/D05/D05.dsc
@@ -125,14 +125,6 @@
 

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000

 

-  # Stacks for MPCores in Secure World

-  gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0xE1000000

-  gArmPlatformTokenSpaceGuid.PcdCPUCoreSecPrimaryStackSize|0x10000

-

-  # Stacks for MPCores in Monitor Mode

-  gArmPlatformTokenSpaceGuid.PcdCPUCoresSecMonStackBase|0xE100FF00

-  gArmPlatformTokenSpaceGuid.PcdCPUCoreSecMonStackSize|0x100

-

   # Stacks for MPCores in Normal World

   gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0xE1000000

   gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0xFF00

@@ -203,10 +195,6 @@
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0xFE000000

 

 

-  # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)

-  gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)"

-  gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"

-

   #

   # ARM Architectual Timer Frequency

   #

diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc
index 3e29df7326..d3fb0832c4 100644
--- a/Platform/Hisilicon/HiKey/HiKey.dsc
+++ b/Platform/Hisilicon/HiKey/HiKey.dsc
@@ -268,7 +268,6 @@
   gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07

   gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000

 

-  gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"hikey"

   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Alpha"

 

   #

diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf
index 76ea730990..6b7481ec6d 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf
+++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf
@@ -55,7 +55,6 @@
 

 [FeaturePcd]

   gEmbeddedTokenSpaceGuid.PcdCacheEnable

-  gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping

 

 [Pcd]

   gArmTokenSpaceGuid.PcdSystemMemoryBase

diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf
index b067f72899..b313d4baad 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf
+++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf
@@ -51,7 +51,6 @@
 

 [FeaturePcd]

   gEmbeddedTokenSpaceGuid.PcdCacheEnable

-  gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping

 

 [Ppis]

   gArmMpCoreInfoPpiGuid

diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc
index 8bcb29a313..cc2367351f 100644
--- a/Silicon/Hisilicon/Hisilicon.dsc.inc
+++ b/Silicon/Hisilicon/Hisilicon.dsc.inc
@@ -253,8 +253,6 @@
   gArmTokenSpaceGuid.PcdArmGicV3WithV2Legacy|TRUE

 

 [PcdsFixedAtBuild.common]

-  gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express"

-

   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|44

   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0

   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000

@@ -321,18 +319,6 @@
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20

   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0

 

-  #

-  # ARM OS Loader

-  #

-  # Versatile Express machine type (ARM VERSATILE EXPRESS = 2272) required for ARM Linux:

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from NorFlash"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/MemoryMapped(0x0,0xED000000,0xED400000)"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|""

-

-  # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)

-  gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(CE660500-824D-11E0-AC72-0002A5D5C51B)"

-  gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi()"

-

   # Set timer interrupt to be triggerred in 1ms to avoid missing

   # serial terminal input characters.

   gEmbeddedTokenSpaceGuid.PcdTimerPeriod|10000

diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf
index f4dc68f762..0a3a6c1bb7 100644
--- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf
+++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf
@@ -47,7 +47,6 @@
 

 [FeaturePcd]

   gEmbeddedTokenSpaceGuid.PcdCacheEnable

-  gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping

 

 [FixedPcd]

   gArmTokenSpaceGuid.PcdSystemMemoryBase

diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
index fa308bd066..23eca287fe 100644
--- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
+++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
@@ -43,7 +43,6 @@
 

 [FeaturePcd]

   gEmbeddedTokenSpaceGuid.PcdCacheEnable

-  gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping

 

 [FixedPcd]

   gArmTokenSpaceGuid.PcdSystemMemoryBase

diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 5101b75da0..bf11e7c813 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -233,14 +233,9 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE

 

 [PcdsFixedAtBuild.common]

-  gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"Marvell"

   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"MARVELL_EFI"

   gArmPlatformTokenSpaceGuid.PcdCoreCount|4

 

-  ## Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)

-  gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"

-  gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"

-

   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000

   gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000

   gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000