From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3A933C4332F for ; Sun, 20 Nov 2022 13:47:42 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6DE5285376; Sun, 20 Nov 2022 14:36:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="EA2yHFOc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9EDA3852D8; Sun, 20 Nov 2022 14:35:16 +0100 (CET) Received: from mail-qt1-x832.google.com (mail-qt1-x832.google.com [IPv6:2607:f8b0:4864:20::832]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2AE67852D8 for ; Sun, 20 Nov 2022 14:34:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x832.google.com with SMTP id w9so5880166qtv.13 for ; Sun, 20 Nov 2022 05:34:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ycQ87ax4O5K585JleXJ2l0Kc3bJAsd/JymN8cPxbjKA=; b=EA2yHFOcRPFs//iXqBqDeAjFnkKiFkp4tUxe8YG1cBHVnjYI++HID8cveOnr63gllw ruLE6rNYTH6w0bOSmrZewuN2xJkJEEmUBohaIUXc4raJQIRWOZnxF37m4LjuZ3/94VG0 dVWf+JeNV/vk6EY1RekWE5GEx1xhiNvpQ/rZ8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ycQ87ax4O5K585JleXJ2l0Kc3bJAsd/JymN8cPxbjKA=; b=rEszDtI7IMziQGf5xqaMuv/EJ9GWfzH4VFi6/6dmydOwGkELnqt5+ndY4LN46PwLlH zyBWPDZvoQkfGqgpFXtFs4v+dijLE782FUyN7KgNXxPBfYUoSLcT4YJbvWXnKuEnCANl Bv8PQIt8Ym0I6C7s1EsnaQ6ENtsr1w82YJeXPssKC5Jo8Ws+xkaKBd9S0+LpIE+O75hh q6OzeqIITImy9C1iHJZNuVs2FOihh3aBXDamup9Pdg0tD+yAeVHSXM9jXbDh3z3XGPwn jwCQzphA+AbjakgrYZuDbk8X+6LVBSskhvN1yibkU/3NAkxOYIWIWzTyGUaJeXhVGMK3 lf8w== X-Gm-Message-State: ANoB5pmd+/rVY09s8qJTfMcK8HS/xN/rQyFN17GcwsHOOCd6sExM7Yfw bDdh0iwkqhz2tz1sGFXhSi2SmqZI912Agw== X-Google-Smtp-Source: AA0mqf7pZYmumyowx6uROMqzgUkG+ypnJv6UY0BiA8ovE0XGhbnx5IQPBDudJGp+ZxJolAd/hDahzg== X-Received: by 2002:a05:622a:514d:b0:3a5:258c:d69c with SMTP id ew13-20020a05622a514d00b003a5258cd69cmr14023495qtb.279.1668951292855; Sun, 20 Nov 2022 05:34:52 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-29a0-035f-b06a-235e.res6.spectrum.com. [2603:6081:7b00:6400:29a0:35f:b06a:235e]) by smtp.gmail.com with ESMTPSA id m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:52 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 084/241] global: Migrate CONFIG_KSNET_NETCP_V1_5 to CFG Date: Sun, 20 Nov 2022 08:31:15 -0500 Message-Id: <20221120133352.3055600-85-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <20221120133352.3055600-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/arm/include/asm/ti-common/keystone_net.h | 8 ++++---- drivers/net/ti/keystone_net.c | 2 +- include/configs/k2e_evm.h | 2 +- include/configs/k2g_evm.h | 2 +- include/configs/k2l_evm.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h index 1576a0473850..3f3c580328bf 100644 --- a/arch/arm/include/asm/ti-common/keystone_net.h +++ b/arch/arm/include/asm/ti-common/keystone_net.h @@ -30,7 +30,7 @@ #define CPGMACSL_REG_RESET 0x0c #define CPGMACSL_REG_MAXLEN 0x10 -#elif defined CONFIG_KSNET_NETCP_V1_5 +#elif defined CFG_KSNET_NETCP_V1_5 #define GBETH_BASE (CFG_KSNET_NETCP_BASE + 0x00200000) #define CPGMACSL_REG_RX_PRI_MAP 0x020 @@ -130,7 +130,7 @@ struct mac_sl_cfg { #define CPSW_REG_ALE_PORTCTL(x) (0x640 + (x) * 4) #define CPSW_REG_VAL_STAT_ENABLE_ALL 0xf -#elif defined CONFIG_KSNET_NETCP_V1_5 +#elif defined CFG_KSNET_NETCP_V1_5 #define DEVICE_CPSW_BASE (GBETH_BASE + 0x20000) #define CPSW_REG_CTL 0x00004 @@ -168,7 +168,7 @@ struct mac_sl_cfg { #ifdef CFG_KSNET_NETCP_V1_0 #define SGMII_OFFSET(x) ((x <= 1) ? (x * 0x100) : ((x * 0x100) + 0x100)) -#elif defined CONFIG_KSNET_NETCP_V1_5 +#elif defined CFG_KSNET_NETCP_V1_5 #define SGMII_OFFSET(x) ((x) * 0x100) #endif @@ -195,7 +195,7 @@ struct mac_sl_cfg { #define hw_config_streaming_switch()\ writel(DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI, DEVICE_PSTREAM_CFG_REG_ADDR); -#elif defined CONFIG_KSNET_NETCP_V1_5 +#elif defined CFG_KSNET_NETCP_V1_5 #define DEVICE_PSTREAM_CFG_REG_ADDR (CFG_KSNET_NETCP_BASE + 0x500) #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI 0x0 diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index 513c7b32521f..db942811db76 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -70,7 +70,7 @@ enum link_type { #define DEVICE_EMACSW_BASE(base, x) ((base) + EMAC_EMACSW_PORT_BASE_OFS + \ (x) * 0x30) -#elif defined(CONFIG_KSNET_NETCP_V1_5) +#elif defined(CFG_KSNET_NETCP_V1_5) #define EMAC_EMACSW_PORT_BASE_OFS 0x222000 diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index eabd06ff9b7a..024563b5dd68 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -37,7 +37,7 @@ #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS /* Network */ -#define CONFIG_KSNET_NETCP_V1_5 +#define CFG_KSNET_NETCP_V1_5 #define CFG_KSNET_CPSW_NUM_PORTS 9 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index e3f4f5ed4743..a6022cba68ad 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -51,7 +51,7 @@ "name_fs=arago-base-tisdk-image-k2g-evm.cpio\0" /* Network */ -#define CONFIG_KSNET_NETCP_V1_5 +#define CFG_KSNET_NETCP_V1_5 #define CFG_KSNET_CPSW_NUM_PORTS 2 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index aa9075cfd8ef..5ebc108d098c 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -37,7 +37,7 @@ #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS /* Network */ -#define CONFIG_KSNET_NETCP_V1_5 +#define CFG_KSNET_NETCP_V1_5 #define CFG_KSNET_CPSW_NUM_PORTS 5 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3861edb19315..262995ea1f6a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -92,7 +92,7 @@ CFG_KSNET_MAC_ID_BASE CFG_KSNET_MDIO_PHY_CONFIG_ENABLE CFG_KSNET_NETCP_BASE CFG_KSNET_NETCP_V1_0 -CONFIG_KSNET_NETCP_V1_5 +CFG_KSNET_NETCP_V1_5 CONFIG_KSNET_SERDES_LANES_PER_SGMII CONFIG_KSNET_SERDES_SGMII2_BASE CONFIG_KSNET_SERDES_SGMII_BASE -- 2.25.1