From patchwork Fri Dec 8 18:14:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 121230 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp974893qgn; Fri, 8 Dec 2017 10:15:33 -0800 (PST) X-Google-Smtp-Source: AGs4zMbLJfktCpp7OZXWdFaTtwp0lvMO11lWiMf31wccBGoyzjWFHLZddjwN80haJEb9p9kf6TC9 X-Received: by 10.99.126.6 with SMTP id z6mr31383285pgc.305.1512756932992; Fri, 08 Dec 2017 10:15:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512756932; cv=none; d=google.com; s=arc-20160816; b=q+/vZcozzynv2YKk6w/3NM/QsGdoKdZyptm1u4IJue1iH/8rK4HGNdhV4EIcKM+Ayh VCDPTT6gIRsUeEwAZcgi9KYWCqnNqzq2lxlx9OtAxVGitphnG/MoiZJZ4Of2wrkRKtLs 4f23hSqWdPbj5z/JlDlppH7Tb+C+ZdqsfzVwNv7fPpip2zN0BBYUP8gapS9PZ/Z8zP+s mN1UYJET3yUAlyi0QeWsQw/aw7C3Ao1CydkUIw2Vgpu35Zw9i1yLpWzfNwJSUZROufee 19hrnNDmLhVrXA7nA80gDWOX5smyzIeFsW725879OQ993usqBi6tE5YQ21VuGC+rkSjA 8UFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=AIs06leIyfDkB9ZeHXoZuZAsY/puZD20KrKtJ0DCfW8=; b=jU5nBmng9acaIpIEdCY7JODKX8sHTmgXu8Va6dWcw56B3ox8n0e7sVF0lRVOZBMovh CFO5OxS5NUdMdlfumdRH7e+/s/u2Z5NB6V/OFTSxfwCHj68v9oE4rr3VlMawf0BN14GP ++hcV2S37vEf63Kcq72Wxno5AD2IBum6O0w4JnkRYPoZBP5h+iHdjbQXvY8gQ8JDwY7n cg3AT0YcPHxhYc1L4CEvdwedjaDI7Pndi4fkc+T5c9oQs5OgqKYDap4eaJ0fD3mJBG8o LBH9d1Q/ZczSNtMri+UETMPhjBfKb5Xzb938aSgFovzCWLw8RoKySKx0rsoxvAkNh0aq u1Iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=BH9SYH3n; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id y71si5858836pgd.369.2017.12.08.10.15.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Dec 2017 10:15:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=BH9SYH3n; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id F2ED4221EA0C2; Fri, 8 Dec 2017 10:10:57 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::243; helo=mail-wr0-x243.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::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 2B4642218E94A for ; Fri, 8 Dec 2017 10:10:56 -0800 (PST) Received: by mail-wr0-x243.google.com with SMTP id a41so11613208wra.6 for ; Fri, 08 Dec 2017 10:15:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=plSWV7C6TVUVgjV5fQDWf92ZDvkBwkSxI6WSBluGtqg=; b=BH9SYH3nFrhcWntXVxxhMvH4mzkbCJrj4lJKIJiyivSPD9f9BoY3nFkdo4oWG42d4N s8n18yy7aBjhbDVjrFzZEKsgS4Oqf6zhhxErWMaXkKkQ0rxpgHUwGrZq1RgC1KitZPaN o5tZTm8iTm+s78ja9kw2ibHOL+KYV4zTQ3X4I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=plSWV7C6TVUVgjV5fQDWf92ZDvkBwkSxI6WSBluGtqg=; b=eXhiBZurFibGbKWOcy0O03gKwsGCse8n3eeYHexxuD6VMDKIkjHRNiUIn5U1P5Rh24 5fBtXnP4VjRmBH893uFclBdbKF5Z0l9DUWcH6pnsWwUmMzbdkTjZzL/j09qXOW+RgbwO s0ac3eLhl0ggMnT3PuEGXgc5bJpiVtziRIV0gfWv29sXUb/bxmDErih66wXFvetR9aEA T9cFnZnin314YGGpAFn/w89y9LnvTMwun+s8jgYaFkIC4rsijey/NZs3C39G8sBElku5 jGB/jIc2UfM6R1SBh5K3D1x09OHVGVGOEkRYyPNaRIPlibLKXyYKu0VSPIEGw7o+ZWD9 1gNw== X-Gm-Message-State: AJaThX6LOTy+yf/hif7fwRVQngMNJL2CAz2MKW4zfrqhUhx4dup8AvaI IROJbmbW9wRSgczs8GRbBwlItMUxh2I= X-Received: by 10.223.171.177 with SMTP id s46mr27094302wrc.194.1512756928996; Fri, 08 Dec 2017 10:15:28 -0800 (PST) Received: from localhost.localdomain ([160.171.158.223]) by smtp.gmail.com with ESMTPSA id f19sm2045563wmf.5.2017.12.08.10.15.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Dec 2017 10:15:28 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Fri, 8 Dec 2017 18:14:54 +0000 Message-Id: <20171208181455.3292-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171208181455.3292-1-ard.biesheuvel@linaro.org> References: <20171208181455.3292-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 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: , Cc: leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 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(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel 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" # # 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