From patchwork Fri May 13 16:37:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 67794 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp360843qge; Fri, 13 May 2016 09:39:35 -0700 (PDT) X-Received: by 10.55.27.98 with SMTP id b95mr10530677qkb.18.1463157573812; Fri, 13 May 2016 09:39:33 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id y11si12518973qhy.79.2016.05.13.09.39.33; Fri, 13 May 2016 09:39:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 71F406165E; Fri, 13 May 2016 16:39:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 322DC61678; Fri, 13 May 2016 16:39:25 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 87A1561663; Fri, 13 May 2016 16:38:17 +0000 (UTC) Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by lists.linaro.org (Postfix) with ESMTPS id 289FF61651 for ; Fri, 13 May 2016 16:37:53 +0000 (UTC) Received: by mail-wm0-f51.google.com with SMTP id a17so39213640wme.0 for ; Fri, 13 May 2016 09:37:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=i5ooLHB+8OiVPTpSQ6U4ZHGuXv1zMIjdp0FUzRyOrSM=; b=ilzP/yYd7NQFK0bSYqOmYK4YHfvokhL7SL0B3jN+py66W4fMEQ0eyXXQYE1mmd7QxU F5wjq/ASC540w1TM+DPtouPrKPpe/60dGFx8imYEdJkcM7eVsj47vnYzBiXWgZJwxf6B YB/xAnrI10NYdsJaVqLvOiZ4gguM6Gu2cp/6ACpGep7wW8xgx8S31TTxncDjgFmj+Q1v d6aO6r7B+3aE5ALsk+5OJjeVPiwL8o7D7ZrZUUzZ1BXkaapfhkarzokiqGr4jGlJYMdd dvQXabo+nLqDwjNn74ZNoacd0leSL09veHQtzQghkMKb/KDcBf+ze8VOtWezNBDf4T8k Kzaw== X-Gm-Message-State: AOPr4FWl9FaN1dLHqfle2xanV5Hs1+cCX4dBP4PdrFQfzMdQ1VheELM/2/Wv58Uz/MQlUUyahGs= X-Received: by 10.194.158.226 with SMTP id wx2mr16193505wjb.91.1463157472314; Fri, 13 May 2016 09:37:52 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id e16sm4092904wmc.3.2016.05.13.09.37.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 May 2016 09:37:51 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Fri, 13 May 2016 18:37:10 +0200 Message-Id: <1463157431-22988-4-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1463157431-22988-1-git-send-email-ard.biesheuvel@linaro.org> References: <1463157431-22988-1-git-send-email-ard.biesheuvel@linaro.org> Cc: leo.duran@amd.com Subject: [Linaro-uefi] [PATCH 4/5] Platforms/AMD/Styx: switch to our own version of MAC PCDs X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" In preparation of switching to a version of AmdModulePkg without any dynamic PCDs, introduce our own versions of the XGBE MAC address PCDs and use them instead of the AmdModulePkg ones. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Platforms/AMD/Styx/AcpiTables/AcpiTables.inf | 4 ++-- Platforms/AMD/Styx/AmdStyx.dec | 3 +++ Platforms/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf | 4 ++-- Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf | 5 ++--- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 5 +++-- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Platforms/AMD/Styx/AcpiTables/AcpiTables.inf b/Platforms/AMD/Styx/AcpiTables/AcpiTables.inf index 6bcee5ec664a..ab5239f46c69 100644 --- a/Platforms/AMD/Styx/AcpiTables/AcpiTables.inf +++ b/Platforms/AMD/Styx/AcpiTables/AcpiTables.inf @@ -60,8 +60,8 @@ [Pcd] gAmdStyxTokenSpaceGuid.PcdSocCoreCount gAmdStyxTokenSpaceGuid.PcdSocCpuId - gAmdModulePkgTokenSpaceGuid.PcdEthMacA - gAmdModulePkgTokenSpaceGuid.PcdEthMacB + gAmdStyxTokenSpaceGuid.PcdEthMacA + gAmdStyxTokenSpaceGuid.PcdEthMacB [FixedPcd] gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase diff --git a/Platforms/AMD/Styx/AmdStyx.dec b/Platforms/AMD/Styx/AmdStyx.dec index bf860c3dfeb6..026b29a40399 100644 --- a/Platforms/AMD/Styx/AmdStyx.dec +++ b/Platforms/AMD/Styx/AmdStyx.dec @@ -38,6 +38,9 @@ gAmdStyxTokenSpaceGuid.PcdSocCoreCount|1|UINT32|0x00000100 gAmdStyxTokenSpaceGuid.PcdSocCpuId|1|UINT32|0x00000101 + gAmdStyxTokenSpaceGuid.PcdEthMacA|0|UINT64|0x000d0001 + gAmdStyxTokenSpaceGuid.PcdEthMacB|0|UINT64|0x000d0002 + [PcdsFixedAtBuild] # CPUID Register gAmdStyxTokenSpaceGuid.PcdCpuIdRegister|0xE0000010|UINT32|0x00000200 diff --git a/Platforms/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf b/Platforms/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf index ec673a830789..8c77e6cb9d74 100644 --- a/Platforms/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf +++ b/Platforms/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf @@ -63,8 +63,8 @@ gAmdStyxTokenSpaceGuid.PcdSocCoreCount gAmdStyxTokenSpaceGuid.PcdSocCpuId - gAmdModulePkgTokenSpaceGuid.PcdEthMacA - gAmdModulePkgTokenSpaceGuid.PcdEthMacB + gAmdStyxTokenSpaceGuid.PcdEthMacA + gAmdStyxTokenSpaceGuid.PcdEthMacB [FixedPcd] gAmdStyxTokenSpaceGuid.PcdIscpSupport diff --git a/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf b/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf index ecd2284724c2..2b2862a19e02 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf +++ b/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf @@ -65,9 +65,8 @@ [Pcd] gAmdStyxTokenSpaceGuid.PcdStyxFdt gAmdStyxTokenSpaceGuid.PcdSocCpuId - gAmdModulePkgTokenSpaceGuid.PcdEthMacA - gAmdModulePkgTokenSpaceGuid.PcdEthMacB - gAmdModulePkgTokenSpaceGuid.PcdEthMacB + gAmdStyxTokenSpaceGuid.PcdEthMacA + gAmdStyxTokenSpaceGuid.PcdEthMacB gArmTokenSpaceGuid.PcdSystemMemoryBase [FixedPcd] diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index aa236fb0d258..dcbfd17152ea 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -480,8 +480,9 @@ DEFINE DO_RTK = 0 gAmdModulePkgTokenSpaceGuid.PcdPort0NetSpeed|1 gAmdModulePkgTokenSpaceGuid.PcdPort1NetSpeed|1 - gAmdModulePkgTokenSpaceGuid.PcdEthMacA|0x02A1A2A3A4A5 - gAmdModulePkgTokenSpaceGuid.PcdEthMacB|0x02B1B2B3B4B5 +[PcdsDynamicDefault.common] + gAmdStyxTokenSpaceGuid.PcdEthMacA|0x02A1A2A3A4A5 + gAmdStyxTokenSpaceGuid.PcdEthMacB|0x02B1B2B3B4B5 !endif gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0x0