From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4001:c0b::242; helo=mail-it0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-it0-x242.google.com (mail-it0-x242.google.com [IPv6:2607:f8b0:4001:c0b::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id CB4BA21A1099A for ; Tue, 12 Dec 2017 09:15:03 -0800 (PST) Received: by mail-it0-x242.google.com with SMTP id p139so247256itb.1 for ; Tue, 12 Dec 2017 09:19:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=xBk7RMOdD6pawze2RQcfw/9Q9n4AT1tkv6qQLEOyzgc=; b=S/Ai89IQraTbdjA9wnJVfainZb/36UTTV2KNV60J9tPQzIggFUeJ1su5WZpwWKHOrB amIVMIKd5tJ1eZIviTsYM1lByF6RAWUtTpxB+r5Otw30g0tiU9jY3hoI0lwsd7UQloC6 6YRFwGVe3Igkwqbg2+UWRdydJPoLDCBOujxfc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=xBk7RMOdD6pawze2RQcfw/9Q9n4AT1tkv6qQLEOyzgc=; b=SnHZ9vJEvRhtVTIZ+e9o4zswg/JuRFW9cLVuFseFQgi9AM/PIlkCDxS88VWMN6UUX5 ywFk5TMpzanBfesi14UMLrtgwPgFWAyV+IYeG7zI/vASy/XYuNFMJWxb6f50BO7HKMku LC7yCcvH+qce+/gM6NadFFW5pTQIIi/J1AYmS6atbV90RuVHHfdMjhVMrzxjdEjhZyBc eVZw3NSw7/GCJVOYDtTdfIIZTgkwuEkvSw9PLCi7J3d8Tkdv61XfNce8pa/RYii4US3b umr+V9jtFJIjKi1v13adQox0hyWvXLRMcj3XvpU3ySY7KR2j8Wa5ohskZTGNNrkjgGOx 3Grw== X-Gm-Message-State: AKGB3mLgOYjOv7TP1ofjTedXYry+9MEimkO+ngYj4+bfTrkqzEc0Vn2u fKT9BMwGPAdoZU+e0iBkTEYPP9uoZ9GuGwFpOZnXjQ== X-Google-Smtp-Source: ACJfBov6skvoGklY4joS4VCcsMtL6/TFj3OZfwsJYRValcwGsasas/Qjxke7u+K/I2CUyUPetzWBpOOcC2m3TiqV4e4= X-Received: by 10.36.219.214 with SMTP id c205mr358517itg.65.1513099181943; Tue, 12 Dec 2017 09:19:41 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.104.16 with HTTP; Tue, 12 Dec 2017 09:19:41 -0800 (PST) In-Reply-To: <20171212171724.4jngodq5u7mfwdhl@bivouac.eciton.net> References: <20171208182712.8835-1-ard.biesheuvel@linaro.org> <20171208182712.8835-2-ard.biesheuvel@linaro.org> <20171212171724.4jngodq5u7mfwdhl@bivouac.eciton.net> From: Ard Biesheuvel Date: Tue, 12 Dec 2017 17:19:41 +0000 Message-ID: To: Leif Lindholm Cc: "edk2-devel@lists.01.org" Subject: Re: [PATCH edk2-platforms v2 1/2] Platform: switch to MdeModulePkg's version of PcdFirmwareVendor X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Dec 2017 17:15:04 -0000 Content-Type: text/plain; charset="UTF-8" On 12 December 2017 at 17:17, Leif Lindholm 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 >> --- >> 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 > 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.