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:c09::243; helo=mail-wm0-x243.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) (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 8A30B21A1099A for ; Tue, 12 Dec 2017 09:12:50 -0800 (PST) Received: by mail-wm0-x243.google.com with SMTP id i11so121344wmf.4 for ; Tue, 12 Dec 2017 09:17:29 -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=gLVaMYewkf+c0DdXOp8eS0tk3v/S5dZXyRgA2r0PNWk=; b=FYHXeP/T8oS9/5fqL9tC29+hbMM+n/d49otDX5WHbe8TJ2ycdy0VWRkljkz45x95Sk hjrV0qGOygzQcir9KCKDW+nnISn2QFLSoFKZ5I/G+S+EbUYrnlOLmXwi8jfHK9qtzQLo rvL4nSRgEjRIpK7v1Ju5Jbz5Z6HbxHzZngOYk= 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=gLVaMYewkf+c0DdXOp8eS0tk3v/S5dZXyRgA2r0PNWk=; b=IKqGwjfjrStqZwl9vmpc7I+yehdnihTix/Eaf5WMV4NUdH7ybqfsPg5gntbXXzgqh/ 1OMYGf2eSO3EPr/MjOt373kccZGxjvAdKnmqs389iNhxH9wvdsWK6UrbCyeM1f66DXFe ULKOBPUBx4aoC0GtevXhnQxUPwyAXp3JycL2xG0DeuEORy0hJGeT49jAW64X3JhirEB6 xkbs+v7vL9LkuwDD9+cC6wZATGA3G0494JBc445CWZjtaZvIARZNH+3TgaQbTgwu6XcI K682zH/zz9PmmXQR9QC4tBrRV8Xn7vlDNkGncojFcUOP9hhhKWgZA5IxLORxHRvtkzN9 bHKQ== X-Gm-Message-State: AKGB3mJ8DYVxmtZdVXN5XhLTbSL8G5QQpOybAqeVjWussn0vYgH/3QKA DUJBfx/0ZdmrDh+a8zTAXjZZOWxbUu0= X-Google-Smtp-Source: ACJfBovMrbsmAHtYlwpFXxgrAxDabiqd0HZiTzCHXSxkoHCl1eFavCstwYOXnHYkOBMFqm1ZjjCkLA== X-Received: by 10.28.84.19 with SMTP id i19mr2137723wmb.62.1513099047797; Tue, 12 Dec 2017 09:17:27 -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 e4sm45213wmi.14.2017.12.12.09.17.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Dec 2017 09:17:26 -0800 (PST) Date: Tue, 12 Dec 2017 17:17:24 +0000 From: Leif Lindholm To: Ard Biesheuvel Cc: edk2-devel@lists.01.org Message-ID: <20171212171724.4jngodq5u7mfwdhl@bivouac.eciton.net> References: <20171208182712.8835-1-ard.biesheuvel@linaro.org> <20171208182712.8835-2-ard.biesheuvel@linaro.org> MIME-Version: 1.0 In-Reply-To: <20171208182712.8835-2-ard.biesheuvel@linaro.org> 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:12:51 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 > > # > # 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 >