* [PATCH edk2-platforms v2 0/2] ArmPlatformPkg PCD cleanup @ 2017-12-08 18:27 Ard Biesheuvel 2017-12-08 18:27 ` [PATCH edk2-platforms v2 1/2] Platform: switch to MdeModulePkg's version of PcdFirmwareVendor Ard Biesheuvel 2017-12-08 18:27 ` [PATCH edk2-platforms v2 2/2] Platform Silicon: remove obsolete ArmPlatformPkg PCD assignments Ard Biesheuvel 0 siblings, 2 replies; 7+ messages in thread From: Ard Biesheuvel @ 2017-12-08 18:27 UTC (permalink / raw) To: edk2-devel; +Cc: leif.lindholm, Ard Biesheuvel Remove lots and lots of PCD assignments of obsolete PCDs that are about to be removed from ArmPlatformPkg. Ard Biesheuvel (2): Platform: switch to MdeModulePkg's version of PcdFirmwareVendor Platform Silicon: remove obsolete ArmPlatformPkg PCD assignments Platform/ARM/JunoPkg/ArmJuno.dsc | 13 +------------ Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 3 --- Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 15 +-------------- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 17 +---------------- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 10 ---------- Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf | 2 +- Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf | 1 - Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf | 1 - Platform/Hisilicon/D02/Pv660D02.dsc | 20 -------------------- Platform/Hisilicon/D03/D03.dsc | 20 -------------------- Platform/Hisilicon/D05/D05.dsc | 12 ------------ Platform/Hisilicon/HiKey/HiKey.dsc | 3 +-- Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 2 +- Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 2 +- Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf | 1 - Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf | 1 - Silicon/Hisilicon/Hisilicon.dsc.inc | 14 +------------- Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf | 1 - Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf | 1 - Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 6 +----- 20 files changed, 9 insertions(+), 136 deletions(-) -- 2.11.0 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH edk2-platforms v2 1/2] Platform: switch to MdeModulePkg's version of PcdFirmwareVendor 2017-12-08 18:27 [PATCH edk2-platforms v2 0/2] ArmPlatformPkg PCD cleanup Ard Biesheuvel @ 2017-12-08 18:27 ` Ard Biesheuvel 2017-12-12 17:17 ` Leif Lindholm 2017-12-08 18:27 ` [PATCH edk2-platforms v2 2/2] Platform Silicon: remove obsolete ArmPlatformPkg PCD assignments Ard Biesheuvel 1 sibling, 1 reply; 7+ messages in thread From: Ard Biesheuvel @ 2017-12-08 18:27 UTC (permalink / raw) To: edk2-devel; +Cc: leif.lindholm, Ard Biesheuvel ArmPlatformPkg defines a PcdFirmwareVendor PCD that is hardly ever used. Let's switch to the equivalent one in MdeModulePkg so we can remove the one in ArmPlatformPkg. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- Platform/ARM/JunoPkg/ArmJuno.dsc | 2 +- Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 2 +- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 2 +- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 1 - Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf | 2 +- Platform/Hisilicon/HiKey/HiKey.dsc | 3 +-- Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 2 +- Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 2 +- Silicon/Hisilicon/Hisilicon.dsc.inc | 2 +- Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 2 +- 10 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc index e7cb280ff381..6208af688995 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dsc +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc @@ -85,7 +85,7 @@ [PcdsFeatureFlag.common] gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE [PcdsFixedAtBuild.common] - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Juno" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Juno" # # NV Storage PCDs. Use base of 0x08000000 for NOR0 diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc index 80deaa6fd98d..46738cc45334 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -93,7 +93,7 @@ [PcdsFeatureFlag.common] gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE [PcdsFixedAtBuild.common] - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" gArmPlatformTokenSpaceGuid.PcdCoreCount|5 diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc index c4fd9124dfbc..f4ebd5275840 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -85,7 +85,7 @@ [PcdsFeatureFlag.common] gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE [PcdsFixedAtBuild.common] - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Fixed Virtual Platform" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Fixed Virtual Platform" # Only one core enters UEFI, and PSCI is implemented in EL3 by ATF gArmPlatformTokenSpaceGuid.PcdCoreCount|1 diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index 20552ef1a04a..42640413045b 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -284,7 +284,6 @@ [PcdsFeatureFlag.common] gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwarePerformanceDataTableS3Support|FALSE [PcdsFixedAtBuild.common] - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" !ifdef $(FIRMWARE_VER) gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" !endif diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf index 07c5e1e230e9..8870f42986fd 100644 --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf @@ -48,4 +48,4 @@ [Packages] [Pcd] gArmVExpressTokenSpaceGuid.PcdAndroidFastbootNvmDevicePath - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc index 3e29df7326d6..b76d00750266 100644 --- a/Platform/Hisilicon/HiKey/HiKey.dsc +++ b/Platform/Hisilicon/HiKey/HiKey.dsc @@ -268,8 +268,7 @@ [PcdsFixedAtBuild.common] gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07 gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000 - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"hikey" - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Alpha" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"hikey" # # NV Storage PCDs. diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc index 8fbd7b2d908f..b1008ffdefe4 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc @@ -222,7 +222,7 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE [PcdsFixedAtBuild.common] - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"Linaro" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"Linaro" # non-secure SRAM gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x2E000000 diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc index 895d3b09fdc9..99caa5297fbb 100644 --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc @@ -214,7 +214,7 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|TRUE [PcdsFixedAtBuild.common] - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"Linaro" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"Linaro" # non-secure SRAM gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x2E000000 diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc index 8bcb29a31332..019ff0abef46 100644 --- a/Silicon/Hisilicon/Hisilicon.dsc.inc +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc @@ -253,7 +253,7 @@ [PcdsFeatureFlag.common] gArmTokenSpaceGuid.PcdArmGicV3WithV2Legacy|TRUE [PcdsFixedAtBuild.common] - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|44 gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0 diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc index 5101b75da079..9dc22d46d8b7 100644 --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc @@ -233,7 +233,7 @@ [PcdsFeatureFlag.common] gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE [PcdsFixedAtBuild.common] - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"Marvell" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"Marvell" gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"MARVELL_EFI" gArmPlatformTokenSpaceGuid.PcdCoreCount|4 -- 2.11.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH edk2-platforms v2 1/2] Platform: switch to MdeModulePkg's version of PcdFirmwareVendor 2017-12-08 18:27 ` [PATCH edk2-platforms v2 1/2] Platform: switch to MdeModulePkg's version of PcdFirmwareVendor Ard Biesheuvel @ 2017-12-12 17:17 ` Leif Lindholm 2017-12-12 17:19 ` Ard Biesheuvel 0 siblings, 1 reply; 7+ messages in thread From: Leif Lindholm @ 2017-12-12 17:17 UTC (permalink / raw) To: Ard Biesheuvel; +Cc: edk2-devel On Fri, Dec 08, 2017 at 06:27:11PM +0000, Ard Biesheuvel wrote: > ArmPlatformPkg defines a PcdFirmwareVendor PCD that is hardly ever > used. Let's switch to the equivalent one in MdeModulePkg so we can > remove the one in ArmPlatformPkg. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > --- > Platform/ARM/JunoPkg/ArmJuno.dsc | 2 +- > Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 2 +- > Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 2 +- > Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 1 - > Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf | 2 +- > Platform/Hisilicon/HiKey/HiKey.dsc | 3 +-- > Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 2 +- > Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 2 +- > Silicon/Hisilicon/Hisilicon.dsc.inc | 2 +- > Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 2 +- > 10 files changed, 9 insertions(+), 11 deletions(-) > > diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc > index e7cb280ff381..6208af688995 100644 > --- a/Platform/ARM/JunoPkg/ArmJuno.dsc > +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc > @@ -85,7 +85,7 @@ [PcdsFeatureFlag.common] > gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE > > [PcdsFixedAtBuild.common] > - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Juno" > + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Juno" > > # > # NV Storage PCDs. Use base of 0x08000000 for NOR0 > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > index 80deaa6fd98d..46738cc45334 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > @@ -93,7 +93,7 @@ [PcdsFeatureFlag.common] > gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE > > [PcdsFixedAtBuild.common] > - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" > + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" > > gArmPlatformTokenSpaceGuid.PcdCoreCount|5 > > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > index c4fd9124dfbc..f4ebd5275840 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > @@ -85,7 +85,7 @@ [PcdsFeatureFlag.common] > gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE > > [PcdsFixedAtBuild.common] > - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Fixed Virtual Platform" > + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Fixed Virtual Platform" > > # Only one core enters UEFI, and PSCI is implemented in EL3 by ATF > gArmPlatformTokenSpaceGuid.PcdCoreCount|1 > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > index 20552ef1a04a..42640413045b 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > @@ -284,7 +284,6 @@ [PcdsFeatureFlag.common] > gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwarePerformanceDataTableS3Support|FALSE > > [PcdsFixedAtBuild.common] > - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" > !ifdef $(FIRMWARE_VER) > gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" > !endif > diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf > index 07c5e1e230e9..8870f42986fd 100644 > --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf > +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf > @@ -48,4 +48,4 @@ [Packages] > > [Pcd] > gArmVExpressTokenSpaceGuid.PcdAndroidFastbootNvmDevicePath > - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor > + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor > diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc > index 3e29df7326d6..b76d00750266 100644 > --- a/Platform/Hisilicon/HiKey/HiKey.dsc > +++ b/Platform/Hisilicon/HiKey/HiKey.dsc > @@ -268,8 +268,7 @@ [PcdsFixedAtBuild.common] > gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07 > gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000 > > - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"hikey" > - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Alpha" > + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"hikey" Did you mean to drop the version string and use the MdeModulePkg version of PcdFirmwareVendor? If so, please fold that in. And if so: Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> > > # > # NV Storage PCDs. > diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc > index 8fbd7b2d908f..b1008ffdefe4 100644 > --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc > +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc > @@ -222,7 +222,7 @@ [PcdsFeatureFlag] > gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE > > [PcdsFixedAtBuild.common] > - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"Linaro" > + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"Linaro" > > # non-secure SRAM > gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x2E000000 > diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc > index 895d3b09fdc9..99caa5297fbb 100644 > --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc > +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc > @@ -214,7 +214,7 @@ [PcdsFeatureFlag] > gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|TRUE > > [PcdsFixedAtBuild.common] > - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"Linaro" > + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"Linaro" > > # non-secure SRAM > gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x2E000000 > diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc > index 8bcb29a31332..019ff0abef46 100644 > --- a/Silicon/Hisilicon/Hisilicon.dsc.inc > +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc > @@ -253,7 +253,7 @@ [PcdsFeatureFlag.common] > gArmTokenSpaceGuid.PcdArmGicV3WithV2Legacy|TRUE > > [PcdsFixedAtBuild.common] > - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" > + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" > > gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|44 > gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0 > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc > index 5101b75da079..9dc22d46d8b7 100644 > --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc > +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc > @@ -233,7 +233,7 @@ [PcdsFeatureFlag.common] > gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE > > [PcdsFixedAtBuild.common] > - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"Marvell" > + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"Marvell" > gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"MARVELL_EFI" > gArmPlatformTokenSpaceGuid.PcdCoreCount|4 > > -- > 2.11.0 > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH edk2-platforms v2 1/2] Platform: switch to MdeModulePkg's version of PcdFirmwareVendor 2017-12-12 17:17 ` Leif Lindholm @ 2017-12-12 17:19 ` Ard Biesheuvel 2017-12-12 17:49 ` Leif Lindholm 0 siblings, 1 reply; 7+ messages in thread From: Ard Biesheuvel @ 2017-12-12 17:19 UTC (permalink / raw) To: Leif Lindholm; +Cc: edk2-devel@lists.01.org On 12 December 2017 at 17:17, Leif Lindholm <leif.lindholm@linaro.org> wrote: > On Fri, Dec 08, 2017 at 06:27:11PM +0000, Ard Biesheuvel wrote: >> ArmPlatformPkg defines a PcdFirmwareVendor PCD that is hardly ever >> used. Let's switch to the equivalent one in MdeModulePkg so we can >> remove the one in ArmPlatformPkg. >> >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> >> --- >> Platform/ARM/JunoPkg/ArmJuno.dsc | 2 +- >> Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 2 +- >> Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 2 +- >> Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 1 - >> Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf | 2 +- >> Platform/Hisilicon/HiKey/HiKey.dsc | 3 +-- >> Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 2 +- >> Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 2 +- >> Silicon/Hisilicon/Hisilicon.dsc.inc | 2 +- >> Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 2 +- >> 10 files changed, 9 insertions(+), 11 deletions(-) >> >> diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc >> index e7cb280ff381..6208af688995 100644 >> --- a/Platform/ARM/JunoPkg/ArmJuno.dsc >> +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc >> @@ -85,7 +85,7 @@ [PcdsFeatureFlag.common] >> gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE >> >> [PcdsFixedAtBuild.common] >> - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Juno" >> + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Juno" >> >> # >> # NV Storage PCDs. Use base of 0x08000000 for NOR0 >> diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc >> index 80deaa6fd98d..46738cc45334 100644 >> --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc >> +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc >> @@ -93,7 +93,7 @@ [PcdsFeatureFlag.common] >> gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE >> >> [PcdsFixedAtBuild.common] >> - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" >> + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" >> >> gArmPlatformTokenSpaceGuid.PcdCoreCount|5 >> >> diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc >> index c4fd9124dfbc..f4ebd5275840 100644 >> --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc >> +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc >> @@ -85,7 +85,7 @@ [PcdsFeatureFlag.common] >> gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE >> >> [PcdsFixedAtBuild.common] >> - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Fixed Virtual Platform" >> + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Fixed Virtual Platform" >> >> # Only one core enters UEFI, and PSCI is implemented in EL3 by ATF >> gArmPlatformTokenSpaceGuid.PcdCoreCount|1 >> diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc >> index 20552ef1a04a..42640413045b 100644 >> --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc >> +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc >> @@ -284,7 +284,6 @@ [PcdsFeatureFlag.common] >> gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwarePerformanceDataTableS3Support|FALSE >> >> [PcdsFixedAtBuild.common] >> - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" >> !ifdef $(FIRMWARE_VER) >> gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" >> !endif >> diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf >> index 07c5e1e230e9..8870f42986fd 100644 >> --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf >> +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf >> @@ -48,4 +48,4 @@ [Packages] >> >> [Pcd] >> gArmVExpressTokenSpaceGuid.PcdAndroidFastbootNvmDevicePath >> - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor >> + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor >> diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc >> index 3e29df7326d6..b76d00750266 100644 >> --- a/Platform/Hisilicon/HiKey/HiKey.dsc >> +++ b/Platform/Hisilicon/HiKey/HiKey.dsc >> @@ -268,8 +268,7 @@ [PcdsFixedAtBuild.common] >> gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07 >> gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000 >> >> - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"hikey" >> - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Alpha" >> + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"hikey" > > Did you mean to drop the version string and use the MdeModulePkg > version of PcdFirmwareVendor? > > If so, please fold that in. And if so: > Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> > Ah yes. Also, gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor should be Unicode, so I need to add some missing L"" prefixes here. I will boldly assume that I can retain your R-b for that as well. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH edk2-platforms v2 1/2] Platform: switch to MdeModulePkg's version of PcdFirmwareVendor 2017-12-12 17:19 ` Ard Biesheuvel @ 2017-12-12 17:49 ` Leif Lindholm 0 siblings, 0 replies; 7+ messages in thread From: Leif Lindholm @ 2017-12-12 17:49 UTC (permalink / raw) To: Ard Biesheuvel; +Cc: edk2-devel@lists.01.org On Tue, Dec 12, 2017 at 05:19:41PM +0000, Ard Biesheuvel wrote: > On 12 December 2017 at 17:17, Leif Lindholm <leif.lindholm@linaro.org> wrote: > > On Fri, Dec 08, 2017 at 06:27:11PM +0000, Ard Biesheuvel wrote: > >> ArmPlatformPkg defines a PcdFirmwareVendor PCD that is hardly ever > >> used. Let's switch to the equivalent one in MdeModulePkg so we can > >> remove the one in ArmPlatformPkg. > >> > >> Contributed-under: TianoCore Contribution Agreement 1.1 > >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > >> --- > >> Platform/ARM/JunoPkg/ArmJuno.dsc | 2 +- > >> Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 2 +- > >> Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 2 +- > >> Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 1 - > >> Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf | 2 +- > >> Platform/Hisilicon/HiKey/HiKey.dsc | 3 +-- > >> Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 2 +- > >> Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 2 +- > >> Silicon/Hisilicon/Hisilicon.dsc.inc | 2 +- > >> Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 2 +- > >> 10 files changed, 9 insertions(+), 11 deletions(-) > >> > >> diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc > >> index e7cb280ff381..6208af688995 100644 > >> --- a/Platform/ARM/JunoPkg/ArmJuno.dsc > >> +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc > >> @@ -85,7 +85,7 @@ [PcdsFeatureFlag.common] > >> gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE > >> > >> [PcdsFixedAtBuild.common] > >> - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Juno" > >> + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Juno" > >> > >> # > >> # NV Storage PCDs. Use base of 0x08000000 for NOR0 > >> diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > >> index 80deaa6fd98d..46738cc45334 100644 > >> --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > >> +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > >> @@ -93,7 +93,7 @@ [PcdsFeatureFlag.common] > >> gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE > >> > >> [PcdsFixedAtBuild.common] > >> - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" > >> + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" > >> > >> gArmPlatformTokenSpaceGuid.PcdCoreCount|5 > >> > >> diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > >> index c4fd9124dfbc..f4ebd5275840 100644 > >> --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > >> +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > >> @@ -85,7 +85,7 @@ [PcdsFeatureFlag.common] > >> gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE > >> > >> [PcdsFixedAtBuild.common] > >> - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Fixed Virtual Platform" > >> + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Fixed Virtual Platform" > >> > >> # Only one core enters UEFI, and PSCI is implemented in EL3 by ATF > >> gArmPlatformTokenSpaceGuid.PcdCoreCount|1 > >> diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > >> index 20552ef1a04a..42640413045b 100644 > >> --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > >> +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > >> @@ -284,7 +284,6 @@ [PcdsFeatureFlag.common] > >> gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwarePerformanceDataTableS3Support|FALSE > >> > >> [PcdsFixedAtBuild.common] > >> - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" > >> !ifdef $(FIRMWARE_VER) > >> gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" > >> !endif > >> diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf > >> index 07c5e1e230e9..8870f42986fd 100644 > >> --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf > >> +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf > >> @@ -48,4 +48,4 @@ [Packages] > >> > >> [Pcd] > >> gArmVExpressTokenSpaceGuid.PcdAndroidFastbootNvmDevicePath > >> - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor > >> + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor > >> diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc > >> index 3e29df7326d6..b76d00750266 100644 > >> --- a/Platform/Hisilicon/HiKey/HiKey.dsc > >> +++ b/Platform/Hisilicon/HiKey/HiKey.dsc > >> @@ -268,8 +268,7 @@ [PcdsFixedAtBuild.common] > >> gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07 > >> gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000 > >> > >> - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"hikey" > >> - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Alpha" > >> + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"hikey" > > > > Did you mean to drop the version string and use the MdeModulePkg > > version of PcdFirmwareVendor? > > > > If so, please fold that in. And if so: > > Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> > > Ah yes. Also, gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor should > be Unicode, so I need to add some missing L"" prefixes here. I will > boldly assume that I can retain your R-b for that as well. Yes please :) / Leif ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH edk2-platforms v2 2/2] Platform Silicon: remove obsolete ArmPlatformPkg PCD assignments 2017-12-08 18:27 [PATCH edk2-platforms v2 0/2] ArmPlatformPkg PCD cleanup Ard Biesheuvel 2017-12-08 18:27 ` [PATCH edk2-platforms v2 1/2] Platform: switch to MdeModulePkg's version of PcdFirmwareVendor Ard Biesheuvel @ 2017-12-08 18:27 ` Ard Biesheuvel 2017-12-12 17:17 ` Leif Lindholm 1 sibling, 1 reply; 7+ messages in thread From: Ard Biesheuvel @ 2017-12-08 18:27 UTC (permalink / raw) To: edk2-devel; +Cc: leif.lindholm, Ard Biesheuvel Remove unused ArmPlatformPkg PCDs from all platform descriptions. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- Platform/ARM/JunoPkg/ArmJuno.dsc | 11 ----------- Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 3 --- Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 13 ------------- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 15 --------------- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 9 --------- Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf | 1 - Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf | 1 - Platform/Hisilicon/D02/Pv660D02.dsc | 20 -------------------- Platform/Hisilicon/D03/D03.dsc | 20 -------------------- Platform/Hisilicon/D05/D05.dsc | 12 ------------ Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf | 1 - Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf | 1 - Silicon/Hisilicon/Hisilicon.dsc.inc | 12 ------------ Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf | 1 - Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf | 1 - Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 4 ---- 16 files changed, 125 deletions(-) diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc index 6208af688995..42e922816f32 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dsc +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc @@ -160,17 +160,6 @@ [PcdsFixedAtBuild.common] 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 7da336fbd8e7..ab154da43e36 100644 --- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf +++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf @@ -73,9 +73,6 @@ [FixedPcd] 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 46738cc45334..0db442fda5e0 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -109,19 +109,6 @@ [PcdsFixedAtBuild.common] 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 f4ebd5275840..953de1adcf5c 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -156,21 +156,6 @@ [PcdsFixedAtBuild.common] 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 42640413045b..717f7332c99a 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -368,15 +368,6 @@ [PcdsFixedAtBuild.common] # 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 2322ee6a2cc5..4cbd2ff4b4fa 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf @@ -47,7 +47,6 @@ [Sources.AARCH64] [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 e659f44ad232..269760f8bae5 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf @@ -43,7 +43,6 @@ [Sources.AARCH64] [FeaturePcd] gEmbeddedTokenSpaceGuid.PcdCacheEnable - gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping [FixedPcd] gArmTokenSpaceGuid.PcdSystemMemoryBase diff --git a/Platform/Hisilicon/D02/Pv660D02.dsc b/Platform/Hisilicon/D02/Pv660D02.dsc index a2a94945e57a..9e826aeb6065 100644 --- a/Platform/Hisilicon/D02/Pv660D02.dsc +++ b/Platform/Hisilicon/D02/Pv660D02.dsc @@ -102,14 +102,6 @@ [PcdsFixedAtBuild.common] 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 @@ [PcdsFixedAtBuild.common] 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 d37c3706481e..b434f6854a41 100644 --- a/Platform/Hisilicon/D03/D03.dsc +++ b/Platform/Hisilicon/D03/D03.dsc @@ -112,14 +112,6 @@ [PcdsFixedAtBuild.common] 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 @@ [PcdsFixedAtBuild.common] 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 1574c3feef46..77a89fd8e1ea 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -125,14 +125,6 @@ [PcdsFixedAtBuild.common] 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 @@ [PcdsFixedAtBuild.common] 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/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf index 76ea7309903f..6b7481ec6da8 100644 --- a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf +++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf @@ -55,7 +55,6 @@ [Ppis] [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 b067f7289940..b313d4baad00 100644 --- a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf +++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf @@ -51,7 +51,6 @@ [Guids] [FeaturePcd] gEmbeddedTokenSpaceGuid.PcdCacheEnable - gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping [Ppis] gArmMpCoreInfoPpiGuid diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc index 019ff0abef46..95d4386bcb6f 100644 --- a/Silicon/Hisilicon/Hisilicon.dsc.inc +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc @@ -321,18 +321,6 @@ [PcdsFixedAtBuild.common] 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 f4dc68f762b5..0a3a6c1bb710 100644 --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf @@ -47,7 +47,6 @@ [Sources.AARCH64] [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 fa308bd0663b..23eca287fe59 100644 --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf @@ -43,7 +43,6 @@ [Sources.AARCH64] [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 9dc22d46d8b7..26c6ed04d95c 100644 --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc @@ -237,10 +237,6 @@ [PcdsFixedAtBuild.common] 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 -- 2.11.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH edk2-platforms v2 2/2] Platform Silicon: remove obsolete ArmPlatformPkg PCD assignments 2017-12-08 18:27 ` [PATCH edk2-platforms v2 2/2] Platform Silicon: remove obsolete ArmPlatformPkg PCD assignments Ard Biesheuvel @ 2017-12-12 17:17 ` Leif Lindholm 0 siblings, 0 replies; 7+ messages in thread From: Leif Lindholm @ 2017-12-12 17:17 UTC (permalink / raw) To: Ard Biesheuvel; +Cc: edk2-devel On Fri, Dec 08, 2017 at 06:27:12PM +0000, Ard Biesheuvel wrote: > 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> > --- > Platform/ARM/JunoPkg/ArmJuno.dsc | 11 ----------- > Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 3 --- > Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 13 ------------- > Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 15 --------------- > Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 9 --------- > Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf | 1 - > Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf | 1 - > Platform/Hisilicon/D02/Pv660D02.dsc | 20 -------------------- > Platform/Hisilicon/D03/D03.dsc | 20 -------------------- > Platform/Hisilicon/D05/D05.dsc | 12 ------------ > Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf | 1 - > Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf | 1 - > Silicon/Hisilicon/Hisilicon.dsc.inc | 12 ------------ > Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf | 1 - > Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf | 1 - > Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 4 ---- > 16 files changed, 125 deletions(-) > > diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc > index 6208af688995..42e922816f32 100644 > --- a/Platform/ARM/JunoPkg/ArmJuno.dsc > +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc > @@ -160,17 +160,6 @@ [PcdsFixedAtBuild.common] > 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 7da336fbd8e7..ab154da43e36 100644 > --- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf > +++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf > @@ -73,9 +73,6 @@ [FixedPcd] > > 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 46738cc45334..0db442fda5e0 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > @@ -109,19 +109,6 @@ [PcdsFixedAtBuild.common] > > 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 f4ebd5275840..953de1adcf5c 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > @@ -156,21 +156,6 @@ [PcdsFixedAtBuild.common] > 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 42640413045b..717f7332c99a 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > @@ -368,15 +368,6 @@ [PcdsFixedAtBuild.common] > # 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 2322ee6a2cc5..4cbd2ff4b4fa 100644 > --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf > +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf > @@ -47,7 +47,6 @@ [Sources.AARCH64] > > [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 e659f44ad232..269760f8bae5 100644 > --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf > +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf > @@ -43,7 +43,6 @@ [Sources.AARCH64] > > [FeaturePcd] > gEmbeddedTokenSpaceGuid.PcdCacheEnable > - gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping > > [FixedPcd] > gArmTokenSpaceGuid.PcdSystemMemoryBase > diff --git a/Platform/Hisilicon/D02/Pv660D02.dsc b/Platform/Hisilicon/D02/Pv660D02.dsc > index a2a94945e57a..9e826aeb6065 100644 > --- a/Platform/Hisilicon/D02/Pv660D02.dsc > +++ b/Platform/Hisilicon/D02/Pv660D02.dsc > @@ -102,14 +102,6 @@ [PcdsFixedAtBuild.common] > > 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 @@ [PcdsFixedAtBuild.common] > 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 d37c3706481e..b434f6854a41 100644 > --- a/Platform/Hisilicon/D03/D03.dsc > +++ b/Platform/Hisilicon/D03/D03.dsc > @@ -112,14 +112,6 @@ [PcdsFixedAtBuild.common] > > 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 @@ [PcdsFixedAtBuild.common] > 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 1574c3feef46..77a89fd8e1ea 100644 > --- a/Platform/Hisilicon/D05/D05.dsc > +++ b/Platform/Hisilicon/D05/D05.dsc > @@ -125,14 +125,6 @@ [PcdsFixedAtBuild.common] > > 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 @@ [PcdsFixedAtBuild.common] > 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/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf > index 76ea7309903f..6b7481ec6da8 100644 > --- a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf > +++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf > @@ -55,7 +55,6 @@ [Ppis] > > [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 b067f7289940..b313d4baad00 100644 > --- a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf > +++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf > @@ -51,7 +51,6 @@ [Guids] > > [FeaturePcd] > gEmbeddedTokenSpaceGuid.PcdCacheEnable > - gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping > > [Ppis] > gArmMpCoreInfoPpiGuid > diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc > index 019ff0abef46..95d4386bcb6f 100644 > --- a/Silicon/Hisilicon/Hisilicon.dsc.inc > +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc > @@ -321,18 +321,6 @@ [PcdsFixedAtBuild.common] > 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 f4dc68f762b5..0a3a6c1bb710 100644 > --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf > +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf > @@ -47,7 +47,6 @@ [Sources.AARCH64] > > [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 fa308bd0663b..23eca287fe59 100644 > --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf > +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf > @@ -43,7 +43,6 @@ [Sources.AARCH64] > > [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 9dc22d46d8b7..26c6ed04d95c 100644 > --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc > +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc > @@ -237,10 +237,6 @@ [PcdsFixedAtBuild.common] > 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 > -- > 2.11.0 > ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-12-12 17:45 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-12-08 18:27 [PATCH edk2-platforms v2 0/2] ArmPlatformPkg PCD cleanup Ard Biesheuvel 2017-12-08 18:27 ` [PATCH edk2-platforms v2 1/2] Platform: switch to MdeModulePkg's version of PcdFirmwareVendor Ard Biesheuvel 2017-12-12 17:17 ` Leif Lindholm 2017-12-12 17:19 ` Ard Biesheuvel 2017-12-12 17:49 ` Leif Lindholm 2017-12-08 18:27 ` [PATCH edk2-platforms v2 2/2] Platform Silicon: remove obsolete ArmPlatformPkg PCD assignments Ard Biesheuvel 2017-12-12 17:17 ` Leif Lindholm
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox