From nobody Tue Dec 24 00:10:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1512757644215423.36719934639746; Fri, 8 Dec 2017 10:27:24 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id CDE3D221EA0C3; Fri, 8 Dec 2017 10:22:48 -0800 (PST) Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) (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 97F7E2218E95F for ; Fri, 8 Dec 2017 10:22:47 -0800 (PST) Received: by mail-wr0-x244.google.com with SMTP id v105so11639498wrc.3 for ; Fri, 08 Dec 2017 10:27:22 -0800 (PST) Received: from localhost.localdomain ([160.171.158.223]) by smtp.gmail.com with ESMTPSA id u79sm2195210wma.26.2017.12.08.10.27.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Dec 2017 10:27:19 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::244; helo=mail-wr0-x244.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org 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=IRV77zxFEpCgFR3xnls73afyojgOaBg7ckkJCtbGNM4wnCIexiayJjffqDI22aOclC W/xolxm4Yl4GuJE95akHQOepbZRYyRXTx50mfA+QjPfrxY3O2UOe3IfOb5l84dsIvtd4 ODS3JVff/hR+A+5gAjyJDAdHFtvFh88Fm/p6g= 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=Zge0sMcvCiJZcjPF6lcozUFkTkkRdp/tFAokBsBBy0OO5Fh4uPgHUujrM4N5d3uP8x M7U9vtoHlrW6kbJp61gND0y6hDwTGP4JOxIzx2cMq4rIITPdgLduM3FnBMdlk2mxTQax aUpOnOsJndnOqKeFzf1jJVNlhKDQjVYNmB/NTKTOPlkJMhMTXqY/SEfA0OKjq4oxIh8R QPU9juP2B8IZGv3IqzsnPhHHmYuWtmVUv4oli45wIa5nIdO5jNHfj3hEPlnXAcq4vhEy 6eOHfhIwtTGy9/6ND8xgO+wIKLwe+VOohiAlOU+VJxRF9CaPmmBWB3s0AyTBGC44dwzo mGEw== X-Gm-Message-State: AJaThX4fM897ucY2NPFecbn4Pebt6zw6nbj+69zk/WgB8yLGNUZ/Azgx mPEbXBTWzhKpYAMfRix3p8EdAYW/23c= X-Google-Smtp-Source: AGs4zMba0hruXk/vTgCPzzl/iZu3UV7ZjjWfFvi7ttzbrzCHEwdBHRCV0VbWmOJF9d+Oyd11RrmOqw== X-Received: by 10.223.143.66 with SMTP id p60mr25019161wrb.99.1512757640467; Fri, 08 Dec 2017 10:27:20 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Fri, 8 Dec 2017 18:27:11 +0000 Message-Id: <20171208182712.8835-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171208182712.8835-1-ard.biesheuvel@linaro.org> References: <20171208182712.8835-1-ard.biesheuvel@linaro.org> Subject: [edk2] [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: , Cc: leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Leif Lindholm --- 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/ArmVExpressFastBoo= tDxe.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/ArmJun= o.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 =20 [PcdsFixedAtBuild.common] - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Juno" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Juno" =20 # # NV Storage PCDs. Use base of 0x08000000 for NOR0 diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/A= RM/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 =20 [PcdsFixedAtBuild.common] - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" =20 gArmPlatformTokenSpaceGuid.PcdCoreCount|5 =20 diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platfor= m/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 =20 [PcdsFixedAtBuild.common] - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Fixed Virtual Platform" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Fixed Virtual Plat= form" =20 # 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/VE= xpressPkg/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 =20 [PcdsFixedAtBuild.common] - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" !ifdef $(FIRMWARE_VER) gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER= )" !endif diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVEx= pressFastBootDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBoot= Dxe/ArmVExpressFastBootDxe.inf index 07c5e1e230e9..8870f42986fd 100644 --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFa= stBootDxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFa= stBootDxe.inf @@ -48,4 +48,4 @@ [Packages] =20 [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 =20 - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"hikey" - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Alpha" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"hikey" =20 # # NV Storage PCDs. diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/So= cionext/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 =20 [PcdsFixedAtBuild.common] - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"Linaro" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"Linaro" =20 # 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 =20 [PcdsFixedAtBuild.common] - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"Linaro" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"Linaro" =20 # non-secure SRAM gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x2E000000 diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisili= con.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 =20 [PcdsFixedAtBuild.common] - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" =20 gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|44 gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0 diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvel= l/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 =20 [PcdsFixedAtBuild.common] - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"Marvell" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|"Marvell" gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"MARVELL_EFI" gArmPlatformTokenSpaceGuid.PcdCoreCount|4 =20 --=20 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Tue Dec 24 00:10:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1512757646518845.3654674797322; Fri, 8 Dec 2017 10:27:26 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 0F611221EA0C7; Fri, 8 Dec 2017 10:22:51 -0800 (PST) Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) (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 A14052218E95F for ; Fri, 8 Dec 2017 10:22:49 -0800 (PST) Received: by mail-wr0-x244.google.com with SMTP id y21so11647949wrc.1 for ; Fri, 08 Dec 2017 10:27:24 -0800 (PST) Received: from localhost.localdomain ([160.171.158.223]) by smtp.gmail.com with ESMTPSA id u79sm2195210wma.26.2017.12.08.10.27.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Dec 2017 10:27:21 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::244; helo=mail-wr0-x244.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org 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=R+MDDRV4P8VKhukG44rBND0fwxh0yjn4FWBtjODoQxQ=; b=Fm3xlK/zodUnlKtZznRm4lMjRzDgOZ6RALx6AHQmmWRLx7hItmzWRiVs+CTSJXHpwM KIje2Ji0mLfao5rCBjkC+OtW5oDZa42emTrAI/1GQ+MpxTEv4ceTCu2fxFVl1SaX3z4z QZUyuf/lWPqimhtMFUFjmnEwdsTZSRvHTNPqo= 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=R+MDDRV4P8VKhukG44rBND0fwxh0yjn4FWBtjODoQxQ=; b=K059CnDYD2gFUWpDgUMuVoHA0yKl3vpr67SqZ+kMXHBgvcc+g0EK+69l+1GLGZDcbd xv5VtHi+BSNwBQBu0jimjqeYgzTR1gmoa7WvyEPn37zcyCphjLcNyNjewPXVLbXQaQJ4 5waeue85dQbf6X1UmdC6lUlEKTh0CvGdO820ElH8522s4LHw8FGuPK9fy4Bo+Wp0dVrF g1iSmNV9lK3OeUvaxLOK9e95rIkn/gg56IWwOucOZW7KG7G0xrw4SpDL2q2T89jaAO9l k/UfkGWGwgTkPxjtAVCyqGw459U74+WCZBGBD82EYr0mLaaEsNWUiPjgRSMOcqB6ydu4 4O3A== X-Gm-Message-State: AJaThX7AwElWoZwEEYMH0f60C2qlBNqjNG8mn2N4vqoLQyySzfbmghot q+Z7rc8WYU6q2adeFXRNvSFmUp29Et4= X-Google-Smtp-Source: AGs4zMbWwA9lrn4EEu6eYzVxU2kI9/KqL7MPm9T22ITycVXsRQ+RJWzwq8xer3FTiIWNsmaOwsGT5A== X-Received: by 10.223.182.147 with SMTP id j19mr26945826wre.159.1512757642227; Fri, 08 Dec 2017 10:27:22 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Fri, 8 Dec 2017 18:27:12 +0000 Message-Id: <20171208182712.8835-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171208182712.8835-1-ard.biesheuvel@linaro.org> References: <20171208182712.8835-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms v2 2/2] Platform Silicon: remove obsolete ArmPlatformPkg PCD assignments 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 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Remove unused ArmPlatformPkg PCDs from all platform descriptions. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- Platform/ARM/JunoPkg/ArmJuno.dsc = | 11 ----------- Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf = | 3 --- Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc = | 13 ------------- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc = | 15 --------------- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc = | 9 --------- Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf = | 1 - Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf = | 1 - Platform/Hisilicon/D02/Pv660D02.dsc = | 20 -------------------- Platform/Hisilicon/D03/D03.dsc = | 20 -------------------- Platform/Hisilicon/D05/D05.dsc = | 12 ------------ Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf = | 1 - Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf = | 1 - Silicon/Hisilicon/Hisilicon.dsc.inc = | 12 ------------ Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf = | 1 - Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf = | 1 - Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc = | 4 ---- 16 files changed, 125 deletions(-) diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJun= o.dsc index 6208af688995..42e922816f32 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dsc +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc @@ -160,17 +160,6 @@ [PcdsFixedAtBuild.common] gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E72= 23039-5836-41E1-B542-D7EC736C5E59)" =20 # - # ARM OS Loader - # - gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from NOR Fl= ash" - gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(E7223039-583= 6-41E1-B542-D7EC736C5E59)/Image" - gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"console=3DttyAMA0,11= 5200 earlycon=3Dpl011,0x7ff80000 root=3D/dev/sda1 rootwait verbose debug" - - # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut) - gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-4= 35F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E2= 5FDD51EF94)" - gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-43= 5F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E25= FDD51EF94)" - - # # ARM Architectural Timer Frequency # gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|50000000 diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/Platf= orm/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf index 7da336fbd8e7..ab154da43e36 100644 --- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf +++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf @@ -73,9 +73,6 @@ [FixedPcd] =20 gArmJunoTokenSpaceGuid.PcdJunoFdtDevicePath =20 - gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath - gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument - # PCI Root complex specific PCDs gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress gArmTokenSpaceGuid.PcdPciBusMin diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/A= RM/VExpressPkg/ArmVExpress-CTA15-A7.dsc index 46738cc45334..0db442fda5e0 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -109,19 +109,6 @@ [PcdsFixedAtBuild.common] =20 gArmTokenSpaceGuid.PcdVFPEnabled|1 =20 - # Stacks for MPCores in Secure World - # SRAM (CS1) is only available between 0x14000000 and 0x14001000 on the = model - # ZBT SRAM is available between 0x2E000000 and 0x2E010000 on the model -!ifdef ARM_BIGLITTLE_TC2 - gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0x17000000 -!else - gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0x2E000000 -!endif - gArmPlatformTokenSpaceGuid.PcdCPUCoreSecPrimaryStackSize|0x8000 - gArmPlatformTokenSpaceGuid.PcdCPUCoreSecSecondaryStackSize|0x1000 - # Share Monitor stacks with Secure World - gArmPlatformTokenSpaceGuid.PcdCPUCoreSecMonStackSize|0 - # System Memory (1GB) - An additional 1GB will be added if UEFI is runni= ng on a 2GB Test Chip gArmTokenSpaceGuid.PcdSystemMemoryBase|0x80000000 gArmTokenSpaceGuid.PcdSystemMemorySize|0x40000000 diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platfor= m/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc index f4ebd5275840..953de1adcf5c 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -156,21 +156,6 @@ [PcdsFixedAtBuild.common] gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C000000 =20 # - # ARM OS Loader - # - gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from SemiHo= sting" - gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D7= 2-4719-99AB-C59F199091EB)/Image" - gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"console=3DttyAMA0 ea= rlycon=3Dpl011,0x1c090000 debug user_debug=3D31 loglevel=3D9" - - # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut) -!ifdef EDK2_ENABLE_PL111 - gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-4= 35F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E2= 5FDD51EF94);VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)" -!else - gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-4= 35F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E2= 5FDD51EF94)" -!endif - gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-43= 5F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E25= FDD51EF94)" - - # # ARM Architectural Timer Frequency # # Set tick frequency value to 100Mhz diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VE= xpressPkg/ArmVExpress.dsc.inc index 42640413045b..717f7332c99a 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -368,15 +368,6 @@ [PcdsFixedAtBuild.common] # List of Device Paths that support BootMonFs gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E72= 23039-5836-41E1-B542-D7EC736C5E59);VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A72= 4A)" =20 - # - # ARM OS Loader - # - gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from NorFla= sh" - gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(E7223039-583= 6-41E1-B542-D7EC736C5E59)/Image" - - # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut) - gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-4= 35F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(CE660500-824D-11= E0-AC72-0002A5D5C51B)" - gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-43= 5F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi()" gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10 =20 # RunAxf support via Dynamic Shell Command protocol diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpres= sLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressL= ib.inf index 2322ee6a2cc5..4cbd2ff4b4fa 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf @@ -47,7 +47,6 @@ [Sources.AARCH64] =20 [FeaturePcd] gEmbeddedTokenSpaceGuid.PcdCacheEnable - gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping =20 [FixedPcd] gArmTokenSpaceGuid.PcdSystemMemoryBase diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpres= sLibSec.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpre= ssLibSec.inf index e659f44ad232..269760f8bae5 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec= .inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec= .inf @@ -43,7 +43,6 @@ [Sources.AARCH64] =20 [FeaturePcd] gEmbeddedTokenSpaceGuid.PcdCacheEnable - gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping =20 [FixedPcd] gArmTokenSpaceGuid.PcdSystemMemoryBase diff --git a/Platform/Hisilicon/D02/Pv660D02.dsc b/Platform/Hisilicon/D02/P= v660D02.dsc index a2a94945e57a..9e826aeb6065 100644 --- a/Platform/Hisilicon/D02/Pv660D02.dsc +++ b/Platform/Hisilicon/D02/Pv660D02.dsc @@ -102,14 +102,6 @@ [PcdsFixedAtBuild.common] =20 gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000 =20 - # Stacks for MPCores in Secure World - gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0xE1000000 - gArmPlatformTokenSpaceGuid.PcdCPUCoreSecPrimaryStackSize|0x10000 - - # Stacks for MPCores in Monitor Mode - gArmPlatformTokenSpaceGuid.PcdCPUCoresSecMonStackBase|0xE100FF00 - gArmPlatformTokenSpaceGuid.PcdCPUCoreSecMonStackSize|0x100 - # Stacks for MPCores in Normal World gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0xE1000000 gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0xFF00 @@ -162,18 +154,6 @@ [PcdsFixedAtBuild.common] gHisiTokenSpaceGuid.PcdNORFlashCachableSize|0x8000000 =20 # - # ARM OS Loader - # - # Versatile Express machine type (ARM VERSATILE EXPRESS =3D 2272) requir= ed for ARM Linux: - gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from SATA" - gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"EFI\GRUB2\grubaa64= .efi" - gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"" - - # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut) - gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-4= 35F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-1= 1DF-9547-CF16E0D72085)" - gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-43= 5F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()" - - # # ARM Architectual Timer Frequency # gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|50000000 diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc index d37c3706481e..b434f6854a41 100644 --- a/Platform/Hisilicon/D03/D03.dsc +++ b/Platform/Hisilicon/D03/D03.dsc @@ -112,14 +112,6 @@ [PcdsFixedAtBuild.common] =20 gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000 =20 - # Stacks for MPCores in Secure World - gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0x81000000 - gArmPlatformTokenSpaceGuid.PcdCPUCoreSecPrimaryStackSize|0x10000 - - # Stacks for MPCores in Monitor Mode - gArmPlatformTokenSpaceGuid.PcdCPUCoresSecMonStackBase|0x8100FF00 - gArmPlatformTokenSpaceGuid.PcdCPUCoreSecMonStackSize|0x100 - # Stacks for MPCores in Normal World gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x81000000 gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0xFF00 @@ -187,18 +179,6 @@ [PcdsFixedAtBuild.common] gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x4D100000 =20 # - # ARM OS Loader - # - # Versatile Express machine type (ARM VERSATILE EXPRESS =3D 2272) requir= ed for ARM Linux: - gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from SATA" - gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"EFI\GRUB2\grubaa64= .efi" - gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"" - - # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut) - gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-4= 35F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-1= 1DF-9547-CF16E0D72085)" - gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-43= 5F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()" - - # # ARM Architectual Timer Frequency # # Set it to 0 so that the code will read frequence from register and be diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index 1574c3feef46..77a89fd8e1ea 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -125,14 +125,6 @@ [PcdsFixedAtBuild.common] =20 gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000 =20 - # Stacks for MPCores in Secure World - gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0xE1000000 - gArmPlatformTokenSpaceGuid.PcdCPUCoreSecPrimaryStackSize|0x10000 - - # Stacks for MPCores in Monitor Mode - gArmPlatformTokenSpaceGuid.PcdCPUCoresSecMonStackBase|0xE100FF00 - gArmPlatformTokenSpaceGuid.PcdCPUCoreSecMonStackSize|0x100 - # Stacks for MPCores in Normal World gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0xE1000000 gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0xFF00 @@ -203,10 +195,6 @@ [PcdsFixedAtBuild.common] gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0xFE000000 =20 =20 - # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut) - gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-4= 35F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-1= 1DF-9547-CF16E0D72085)" - gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-43= 5F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()" - # # ARM Architectual Timer Frequency # diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf b/Silicon/A= MD/Styx/Library/AmdStyxLib/AmdStyxLib.inf index 76ea7309903f..6b7481ec6da8 100644 --- a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf +++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf @@ -55,7 +55,6 @@ [Ppis] =20 [FeaturePcd] gEmbeddedTokenSpaceGuid.PcdCacheEnable - gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping =20 [Pcd] gArmTokenSpaceGuid.PcdSystemMemoryBase diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf b/Silico= n/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf index b067f7289940..b313d4baad00 100644 --- a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf +++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf @@ -51,7 +51,6 @@ [Guids] =20 [FeaturePcd] gEmbeddedTokenSpaceGuid.PcdCacheEnable - gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping =20 [Ppis] gArmMpCoreInfoPpiGuid diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisili= con.dsc.inc index 019ff0abef46..95d4386bcb6f 100644 --- a/Silicon/Hisilicon/Hisilicon.dsc.inc +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc @@ -321,18 +321,6 @@ [PcdsFixedAtBuild.common] gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0 =20 - # - # ARM OS Loader - # - # Versatile Express machine type (ARM VERSATILE EXPRESS =3D 2272) requir= ed for ARM Linux: - gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from NorFla= sh" - gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(E7223039-583= 6-41E1-B542-D7EC736C5E59)/MemoryMapped(0x0,0xED000000,0xED400000)" - gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"" - - # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut) - gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-4= 35F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(CE660500-824D-11= E0-AC72-0002A5D5C51B)" - gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-43= 5F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi()" - # Set timer interrupt to be triggerred in 1ms to avoid missing # serial terminal input characters. gEmbeddedTokenSpaceGuid.PcdTimerPeriod|10000 diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformL= ib.inf b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.i= nf index f4dc68f762b5..0a3a6c1bb710 100644 --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf @@ -47,7 +47,6 @@ [Sources.AARCH64] =20 [FeaturePcd] gEmbeddedTokenSpaceGuid.PcdCacheEnable - gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping =20 [FixedPcd] gArmTokenSpaceGuid.PcdSystemMemoryBase diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformL= ibSec.inf b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLi= bSec.inf index fa308bd0663b..23eca287fe59 100644 --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.i= nf +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.i= nf @@ -43,7 +43,6 @@ [Sources.AARCH64] =20 [FeaturePcd] gEmbeddedTokenSpaceGuid.PcdCacheEnable - gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping =20 [FixedPcd] gArmTokenSpaceGuid.PcdSystemMemoryBase diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvel= l/Armada7k8k/Armada7k8k.dsc.inc index 9dc22d46d8b7..26c6ed04d95c 100644 --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc @@ -237,10 +237,6 @@ [PcdsFixedAtBuild.common] gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"MARVELL_EFI" gArmPlatformTokenSpaceGuid.PcdCoreCount|4 =20 - ## Use the serial console (ConIn & ConOut) and the Graphic driver (ConOu= t) - gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-4= 35F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()" - gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-43= 5F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()" - gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000 gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000 gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000 --=20 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel