On Tue, Dec 12, 2017 at 05:19:41PM +0000, Ard Biesheuvel wrote:
> On 12 December 2017 at 17:17, Leif Lindholm <leif.lindh...@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.biesheu...@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.lindh...@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
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
