[PoC 079/241] global: Migrate CONFIG_KSNET_CPSW_NUM_PORTS to CFG

Tom Rini
2022-11-20T13:46:57Z

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