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 8037AC43219 for ; Sun, 20 Nov 2022 13:46:57 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7879A85306; Sun, 20 Nov 2022 14:35:47 +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="D+exE60b"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3DCD5852C5; Sun, 20 Nov 2022 14:35:12 +0100 (CET) Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) (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 AD0C0852C9 for ; Sun, 20 Nov 2022 14:34:50 +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-x72b.google.com with SMTP id d8so6473002qki.13 for ; Sun, 20 Nov 2022 05:34:50 -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=8NmXz5SfWWb2hf5H9VnZAbJ1iq50HFsX3f4h6I5gnH4=; b=D+exE60bEaHLXjRe1mXLwcCO95a1nMN6+SN+yEGlB5fbQ3hhJFQvO1P25GZDzXQSm7 gH4PSr2fuEGABe8Afi3nmnAmBLt0bgbIg7ucrIDxBDJ4VvwuxSpdOvNqZHJgFFQ+DT+f VQAuWbdOiXbmjB8M3rwM7KGPels/84U2tBw/U= 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=8NmXz5SfWWb2hf5H9VnZAbJ1iq50HFsX3f4h6I5gnH4=; b=asrkexOHtfKlBRXGtNUcByTQ3sdxP+685jKDpeFQisxZcZ45i0TiY/iI07+qT5wySZ nKzsQlNAf4zmik67QclZmYHwrQ0yuA3g21IrnjyUdL2yGl9KsFQhF8PMJHT5mA7JWH4Z YvPy73xaL1vYcZVocvr9ybfAYHAZ+7qXRsXYXNVg0yINjRf8ACxL0W5UxQyzligNVm+s IsmrN5B6RKWh7tO/HyS/m974xOxzA5BQ244DeuFsorofShFAYtm3ivI8aADOiHa8yYBs q1aihFlCRP+PteJYa6WW5FuvfphCI5AhqziIV9GpeXedmiuvPlJ4pFLlCuiJZbx+Flxa nAxg== X-Gm-Message-State: ANoB5pkM2EmavdhEOs8NV+yORSnys7zwAcogv7msh3J8lOr2n8qKPI+N 3AX9Bjj6qY7ARPXLqTErkeCsUMq2OQaMAw== X-Google-Smtp-Source: AA0mqf5dIlt74k/EU0zvdyyeUCoDGT4aUfCEodueGOPLP6tw7UKGJHtAeXFNcciBPFrRoSWThPRGdg== X-Received: by 2002:a37:7c6:0:b0:6ea:a9e4:6225 with SMTP id 189-20020a3707c6000000b006eaa9e46225mr12812039qkh.320.1668951289415; Sun, 20 Nov 2022 05:34:49 -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.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:49 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 079/241] global: Migrate CONFIG_KSNET_CPSW_NUM_PORTS to CFG Date: Sun, 20 Nov 2022 08:31:10 -0500 Message-Id: <20221120133352.3055600-80-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 | 2 +- include/configs/k2e_evm.h | 2 +- include/configs/k2g_evm.h | 2 +- include/configs/k2hk_evm.h | 2 +- include/configs/k2l_evm.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h index 0852ce80a641..21cac6ea312a 100644 --- a/arch/arm/include/asm/ti-common/keystone_net.h +++ b/arch/arm/include/asm/ti-common/keystone_net.h @@ -117,7 +117,7 @@ struct mac_sl_cfg { #define CPSW_CTL_VLAN_AWARE BIT(1) #define CPSW_CTL_FIFO_LOOPBACK BIT(0) -#define DEVICE_CPSW_NUM_PORTS CONFIG_KSNET_CPSW_NUM_PORTS +#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 diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index bbc58be511e4..026568c4dfb3 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -38,7 +38,7 @@ /* Network */ #define CONFIG_KSNET_NETCP_V1_5 -#define CONFIG_KSNET_CPSW_NUM_PORTS 9 +#define CFG_KSNET_CPSW_NUM_PORTS 9 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE #endif /* __CONFIG_K2E_EVM_H */ diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index bb91751d5d90..feaa43ba7f71 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -52,7 +52,7 @@ /* Network */ #define CONFIG_KSNET_NETCP_V1_5 -#define CONFIG_KSNET_CPSW_NUM_PORTS 2 +#define CFG_KSNET_CPSW_NUM_PORTS 2 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index 68cbe98b553b..e35f080279ae 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -38,6 +38,6 @@ /* Network */ #define CONFIG_KSNET_NETCP_V1_0 -#define CONFIG_KSNET_CPSW_NUM_PORTS 5 +#define CFG_KSNET_CPSW_NUM_PORTS 5 #endif /* __CONFIG_K2HK_EVM_H */ diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index a18158a7eb33..b60fc2a55de3 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -38,7 +38,7 @@ /* Network */ #define CONFIG_KSNET_NETCP_V1_5 -#define CONFIG_KSNET_CPSW_NUM_PORTS 5 +#define CFG_KSNET_CPSW_NUM_PORTS 5 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE #endif /* __CONFIG_K2L_EVM_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2b4db3778e20..ddcc89f508e1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -87,7 +87,7 @@ CFG_KM_UBI_PARTITION_NAME_APP CFG_KM_UBI_PARTITION_NAME_BOOT CFG_KM_UBI_PART_BOOT_OPTS CFG_KM_UIMAGE_NAME -CONFIG_KSNET_CPSW_NUM_PORTS +CFG_KSNET_CPSW_NUM_PORTS CONFIG_KSNET_MAC_ID_BASE CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE CONFIG_KSNET_NETCP_BASE -- 2.25.1