From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::241; helo=mail-wr0-x241.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) (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 9ADAC21A1099A for ; Tue, 12 Dec 2017 09:45:10 -0800 (PST) Received: by mail-wr0-x241.google.com with SMTP id s66so22033188wrc.9 for ; Tue, 12 Dec 2017 09:49:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=tYS2v9w5lMnBhpd8tMfq0A1EwEdW9YD0ZxgUsOhj47Y=; b=NOeTXH7oHzghB98ZotM+oZp3KawD3nrRtj4m5KhtWtF/NX/jiP/A4q6cnaMNUEneIm Oi3dwLL5x7iQM7hlVqmj1+vsBxRKCz7l88F6vNVmBZGMiNnROEV6NAcU4GBIYVUTr82I RXVaIpqCTJI/vr1vsJ2tbSPkYPljWd7j9VQlU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=tYS2v9w5lMnBhpd8tMfq0A1EwEdW9YD0ZxgUsOhj47Y=; b=rOqRsazHuGVzIfPEvKdPzpZyDQn/GFq81H8F79at7/JrJXgl93YoyRfMa65v9AVmp6 L7+2aOnG7EXdMBWWWdtW/z1sbgOiWCoszA4QWBXFSuF2KvBYGGKoXF0gFVQZpciwCCWM DMKD9W243Kql1FfnLHKTydzU1EBiot6sjdCAkZdJG9yQ+lQBr2N23PPKmAVELiPeLSd0 TNGFtFFyzaj+yH57YJrWfoQ1bzZnnIB7EyPJOYx73g83iyBYq6aXOHJvkzABqxf4BK28 Ks/Z2/2RCkdnzpgPggp/clV8SSRSMFqcQTwB03w6tcDImz8gZosaYqOflkmOoRZ3dOgc gfCQ== X-Gm-Message-State: AKGB3mKeFkyQeX0bwCfUoDDNL7724pJ1tVbqqQ+XO+/PAMjj/7aN7KmH Xjo79b/n+1UIU8EutwRiovXfIeH20LY= X-Google-Smtp-Source: ACJfBoux+NknYi5Y+R4dTFCkpHEzKnPs2bEQe1/kJd7/TWPRxrlKpQRTHf0goN2RT3zLKWnjQnJhzg== X-Received: by 10.223.142.193 with SMTP id q59mr4346004wrb.262.1513100987893; Tue, 12 Dec 2017 09:49:47 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id m134sm121263wmg.6.2017.12.12.09.49.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Dec 2017 09:49:46 -0800 (PST) Date: Tue, 12 Dec 2017 17:49:45 +0000 From: Leif Lindholm To: Ard Biesheuvel Cc: "edk2-devel@lists.01.org" Message-ID: <20171212174945.ufeqwvnzktses3xy@bivouac.eciton.net> References: <20171208182712.8835-1-ard.biesheuvel@linaro.org> <20171208182712.8835-2-ard.biesheuvel@linaro.org> <20171212171724.4jngodq5u7mfwdhl@bivouac.eciton.net> MIME-Version: 1.0 In-Reply-To: User-Agent: NeoMutt/20170113 (1.7.2) 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:45:11 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Dec 12, 2017 at 05:19:41PM +0000, Ard Biesheuvel wrote: > 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. Yes please :) / Leif