From patchwork Tue Dec 11 18:35:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 153496 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp949263ljp; Tue, 11 Dec 2018 10:35:46 -0800 (PST) X-Google-Smtp-Source: AFSGD/UTkSgdAxk61XZNpjLSVA1/QuLdJ8AtZOyj8keVjRSr0vKl6WOiIhivMuKi9O3Pk56le6MV X-Received: by 2002:a17:902:708b:: with SMTP id z11mr17024154plk.203.1544553346029; Tue, 11 Dec 2018 10:35:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544553346; cv=none; d=google.com; s=arc-20160816; b=YlsQ4YTkt2Z0SEatYRlpAUTzOcffjVbKQuzSn9gARw3Dpyu2nV2WzTZVNlxpWdUHWv yuGisk+S2oC4dk+aioOejZCUq/nlFCOinPiS+7r52kCfCxxMO2o+CnTv4tZDJWgLWH0y E7l9F3lNfRL2d/rGd8HRbo1BvzUarnFkC1OkkKagl9n3Eo9QemNkv+0kCkefiBQacXaN u6pMxXiyqWCa8aE5t+OtUmSaTG66+9/f2Uvtl9YkhKQjt08R8Ei+n3ZjpsjV2XqufU+z Luq3nINT3R78b+oCBmS/efQDFG6HV9/n/hrggSnRcbC27LSm4z+1fPuz1v+pPO3WzRmX jhbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=Vvt027FwoCcCmbTPEX7wy0gFzfwXId2+EfDu1wxlVjk=; b=p2UFU04C+0oRskzt1DB5qGpouoNA1TqrV4P2o2IZvgvG2JeYwtuOI6SdDN5FHtgsrm oDdkexNYwS5b6TTeMA8AdhUifvxW1Tx56/llGo0/y+4gn+c0pfEJSIghbL4yb/dpTCT7 oGEtqlf6DHqy248N47DzOsq3m+7eiHbTaUg9cCD5AL8DBW80VcirVeprOC0BbsXFvDxW 8hC+YQuz7lCEbZm4MhgY+jxjWyIjzVaLWkWuCoiQnKk+8AvRvgdDwHIs9gYSdcZOudDN 6mtlTyHGMDiIQW38E3hKtOTMIGpyeYbrNw0KEFXqVEkts/tzoOW8oShKKKX45yzY3F9N 5KHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=f2LwJsSz; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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. [198.145.21.10]) by mx.google.com with ESMTPS id w5si11388987pfl.279.2018.12.11.10.35.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=f2LwJsSz; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 206D32119AC09; Tue, 11 Dec 2018 10:35:35 -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:4864:20::443; helo=mail-wr1-x443.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (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 BBB512194D3AE for ; Tue, 11 Dec 2018 10:35:31 -0800 (PST) Received: by mail-wr1-x443.google.com with SMTP id v13so15171288wrw.5 for ; Tue, 11 Dec 2018 10:35:31 -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 :mime-version:content-transfer-encoding; bh=AjDXq60Bj10lM/slaVhP2ReLF2yDhFJzNGndeu8XLJI=; b=f2LwJsSzwpBFlWTRWqyG75DUpA6i82q5FoNytTW2Sqp02SF9sQ5Iz5bNPyo0VE7YCq 0PQZHdH2xDII2w7aKy0TUTrpocMAvpLeNsQ4wJnS/H5fB1VrSevlJVb27C7HM9xz4y/E O7wC79p3nRgrLWDU4uYAoAVjphzfqRWNmj+6I= 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:mime-version:content-transfer-encoding; bh=AjDXq60Bj10lM/slaVhP2ReLF2yDhFJzNGndeu8XLJI=; b=rguCyi/E8bBoSFbJo/w6Lk9KokViabAwiJp4SeOhP5t7ZsBUesQ1s2xX00jD73uIjf fzYm6sq7feJx9Aolxmw8YbBCvHLjCnFHOAbFSUfXySYiCdr9Ie99+cZgasW0hRgLIIvj YMxLwIFG0NSOgY9zkYtVUjt0q0KX8OqUpq5IbvLrZIDk/iI6xevZFkdn96gNiLqRE4GR nDAEFGv87X/0ZijlqI92RohhZpLl3kmIlUkF0UxYPMTLIdPgZvoPl5g8NXyfFnUQvO74 x2elc/ajbo6DB2EBWLjpVMbvZzevupSYPICjBfhWKKHzHYI0w72jovp7St/iXCS6AMTP vEcA== X-Gm-Message-State: AA+aEWYooGhHUYSqcQhMGNFwTqRdIf3A5rJhhyv0qAoYdferEejEGwrl xJ9uOjVOQR2dabyewj4NiyBYTBtnP3C54Q== X-Received: by 2002:a5d:4e82:: with SMTP id e2mr14055936wru.291.1544553329966; Tue, 11 Dec 2018 10:35:29 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:8c3:6b9d:cbc9:58c6]) by smtp.gmail.com with ESMTPSA id h131sm1026688wmd.17.2018.12.11.10.35.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:29 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 11 Dec 2018 19:35:09 +0100 Message-Id: <20181211183514.20948-7-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211183514.20948-1-ard.biesheuvel@linaro.org> References: <20181211183514.20948-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-platforms 06/11] Platform/AMD/OverdriveBoard: drop DO_XGBE C preprocessor defines X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alan@softiron.co.uk Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Now that all code relies on the PCD rather than the DO_XGBE macro, get rid of it. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 9 ++------- Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 2 -- 2 files changed, 2 insertions(+), 9 deletions(-) -- 2.19.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc index 3b680e22cd36..fb524cfc5490 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -17,7 +17,6 @@ ################################################################################ [Defines] -DEFINE DO_XGBE = 1 DEFINE NUM_CORES = 8 DEFINE DO_KCS = 1 DEFINE DO_FLASHER = FALSE @@ -272,8 +271,8 @@ DEFINE DO_CAPSULE = FALSE *_*_*_ASLPP_FLAGS = $(ARCHCC_FLAGS) *_*_*_ASLCC_FLAGS = $(ARCHCC_FLAGS) - GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_XGBE=$(DO_XGBE) -DDO_KCS=$(DO_KCS) - GCC:*_*_AARCH64_PP_FLAGS = -DDO_XGBE=$(DO_XGBE) -DDO_KCS=$(DO_KCS) + GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_KCS=$(DO_KCS) + GCC:*_*_AARCH64_PP_FLAGS = -DDO_KCS=$(DO_KCS) [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000 @@ -465,7 +464,6 @@ DEFINE DO_CAPSULE = FALSE gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE -!if $(DO_XGBE) gAmdModulePkgTokenSpaceGuid.PcdXgbeEnable|TRUE gAmdModulePkgTokenSpaceGuid.PcdPort0PhyMode|0 @@ -480,7 +478,6 @@ DEFINE DO_CAPSULE = FALSE [PcdsPatchableInModule] gAmdModulePkgTokenSpaceGuid.PcdXgbeUseMacFromIscp|TRUE gAmdModulePkgTokenSpaceGuid.PcdXgbeRev|2 -!endif [PcdsPatchableInModule] # PCIe Configuration: x4x4 @@ -654,13 +651,11 @@ DEFINE DO_CAPSULE = FALSE MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf -!if $(DO_XGBE) # # SNP support # Silicon/AMD/Styx/AmdModulePkg/SnpDxe/SnpDxePort0.inf Silicon/AMD/Styx/AmdModulePkg/SnpDxe/SnpDxePort1.inf -!endif # # Networking stack diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf index b5c03034a44a..31b9e18d3c29 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf @@ -181,13 +181,11 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf -!if $(DO_XGBE) # # SNP support # INF Silicon/AMD/Styx/AmdModulePkg/SnpDxe/SnpDxePort0.inf INF Silicon/AMD/Styx/AmdModulePkg/SnpDxe/SnpDxePort1.inf -!endif # # Networking stack