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 414E5C4332F for ; Sun, 20 Nov 2022 13:47:15 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DD717852E2; Sun, 20 Nov 2022 14:36:06 +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="juyYE8c4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 63E3485316; Sun, 20 Nov 2022 14:35:14 +0100 (CET) Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) (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 8880485284 for ; Sun, 20 Nov 2022 14:34:53 +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-qk1-x730.google.com with SMTP id x21so6534102qkj.0 for ; Sun, 20 Nov 2022 05:34:53 -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=Lf9RRhE6lOmF8gPWi+Z13oH5x5k+OPTJ8jZK8en+6zo=; b=juyYE8c4kN/z1+I6degYftZYyYH8GAGwZDRTkmg00EoQUhS4MVq5bTi7nIrH+Cafio PItMS9gDrJuMJ31Q9vWbgrtp5gTCpx0We/OhL2CqJ3B26DMi5JDvr84sKwtMBg7CCOo3 KPTMY+yIIPsY+7OLm0Da5X+ylXCSJ7Ej8VjHY= 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=Lf9RRhE6lOmF8gPWi+Z13oH5x5k+OPTJ8jZK8en+6zo=; b=P+LWMZZILCAulzSOg8+rX3ZuRgqbmaZi1jRBQoZ+/ZyXAGMq2fAffVwPJA2XWeE5xi aLsFR4mVN1J9nABipqXVyt1iorIJO68GVrcSes0cmJL340OuPLbU/4en9tyQfP+1efMP EKEJZ+Ihn68Tuq8WoAQvue86CW6P4Bb6cmijP3+/ZQDgMXMNjMSELMwAAfmFDJNlL/Lg BXppc45XgLZrBP/Km6901XkC+7MQovlwnR4lOU7GjbihVoSaJKaap0XxCTy0zgDPucfk XCYAg5rdTXOa8d/el219MkZHiBT9vT1YOp11lObhue6t8Lr9FE3jBoiETa0XsubsLZPT 9LDg== X-Gm-Message-State: ANoB5pnYJSCY0eAQbzpo+cyh0LY2J2ZRWX/YxQZg4rvAA68MMp3xA6Ff VgPBsR6k1SQ0ouY6ai1YVF7jGlGXSOKOOw== X-Google-Smtp-Source: AA0mqf630Mrd/irkx23ffgpgZDwJTrtozEltviy87BQzl+pnAAW+Ab5ZY3NcOtKVWwAAO6Uw5pc5Wg== X-Received: by 2002:a05:620a:c95:b0:6fa:91f9:c84d with SMTP id q21-20020a05620a0c9500b006fa91f9c84dmr12649994qki.724.1668951292244; 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.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:51 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 083/241] global: Migrate CONFIG_KSNET_NETCP_V1_0 to CFG Date: Sun, 20 Nov 2022 08:31:14 -0500 Message-Id: <20221120133352.3055600-84-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/k2hk_evm.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h index bedbcdc8bac6..1576a0473850 100644 --- a/arch/arm/include/asm/ti-common/keystone_net.h +++ b/arch/arm/include/asm/ti-common/keystone_net.h @@ -16,7 +16,7 @@ #endif /* EMAC */ -#ifdef CONFIG_KSNET_NETCP_V1_0 +#ifdef CFG_KSNET_NETCP_V1_0 #define GBETH_BASE (CFG_KSNET_NETCP_BASE + 0x00090000) #define EMAC_EMACSL_BASE_ADDR (GBETH_BASE + 0x900) @@ -120,7 +120,7 @@ struct mac_sl_cfg { #define DEVICE_CPSW_NUM_PORTS CFG_KSNET_CPSW_NUM_PORTS #define DEVICE_N_GMACSL_PORTS (DEVICE_CPSW_NUM_PORTS - 1) -#ifdef CONFIG_KSNET_NETCP_V1_0 +#ifdef CFG_KSNET_NETCP_V1_0 #define DEVICE_CPSW_BASE (GBETH_BASE + 0x800) #define CPSW_REG_CTL 0x004 @@ -166,7 +166,7 @@ struct mac_sl_cfg { #define SGMII_LINK_MAC_FIBER 3 #define SGMII_LINK_MAC_PHY_FORCED 4 -#ifdef CONFIG_KSNET_NETCP_V1_0 +#ifdef CFG_KSNET_NETCP_V1_0 #define SGMII_OFFSET(x) ((x <= 1) ? (x * 0x100) : ((x * 0x100) + 0x100)) #elif defined CONFIG_KSNET_NETCP_V1_5 #define SGMII_OFFSET(x) ((x) * 0x100) @@ -188,7 +188,7 @@ struct mac_sl_cfg { #define RGMII_STATUS_REG (GBETH_BASE + 0x18) /* PSS */ -#ifdef CONFIG_KSNET_NETCP_V1_0 +#ifdef CFG_KSNET_NETCP_V1_0 #define DEVICE_PSTREAM_CFG_REG_ADDR (CFG_KSNET_NETCP_BASE + 0x604) #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI 0x06060606 diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index 1bdbd599d7b4..513c7b32521f 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -58,7 +58,7 @@ enum link_type { ((mac)[2] << 16) | ((mac)[3] << 24)) #define mac_lo(mac) (((mac)[4] << 0) | ((mac)[5] << 8)) -#ifdef CONFIG_KSNET_NETCP_V1_0 +#ifdef CFG_KSNET_NETCP_V1_0 #define EMAC_EMACSW_BASE_OFS 0x90800 #define EMAC_EMACSW_PORT_BASE_OFS (EMAC_EMACSW_BASE_OFS + 0x60) diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index e35f080279ae..600e73f11e78 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -37,7 +37,7 @@ #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS /* Network */ -#define CONFIG_KSNET_NETCP_V1_0 +#define CFG_KSNET_NETCP_V1_0 #define CFG_KSNET_CPSW_NUM_PORTS 5 #endif /* __CONFIG_K2HK_EVM_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7d609640e855..3861edb19315 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -91,7 +91,7 @@ CFG_KSNET_CPSW_NUM_PORTS CFG_KSNET_MAC_ID_BASE CFG_KSNET_MDIO_PHY_CONFIG_ENABLE CFG_KSNET_NETCP_BASE -CONFIG_KSNET_NETCP_V1_0 +CFG_KSNET_NETCP_V1_0 CONFIG_KSNET_NETCP_V1_5 CONFIG_KSNET_SERDES_LANES_PER_SGMII CONFIG_KSNET_SERDES_SGMII2_BASE -- 2.25.1