From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: Leif Lindholm <leif.lindholm@linaro.org>
Cc: "edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [PATCH edk2-platforms v2 1/2] Platform: switch to MdeModulePkg's version of PcdFirmwareVendor
Date: Tue, 12 Dec 2017 17:19:41 +0000 [thread overview]
Message-ID: <CAKv+Gu-zXxVtZcwJRZNeLAAE07_keBBqh=_uqayUW9+DjJO6DQ@mail.gmail.com> (raw)
In-Reply-To: <20171212171724.4jngodq5u7mfwdhl@bivouac.eciton.net>
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.
next prev parent reply other threads:[~2017-12-12 17:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKv+Gu-zXxVtZcwJRZNeLAAE07_keBBqh=_uqayUW9+DjJO6DQ@mail.gmail.com' \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox