[PoC 080/241] global: Migrate CONFIG_KSNET_MAC_ID_BASE to CFG

Tom Rini trini at konsulko.com
Sun Nov 20 14:31:11 CET 2022


Signed-off-by: Tom Rini <trini at konsulko.com>
---
 arch/arm/include/asm/ti-common/keystone_net.h | 2 +-
 include/configs/ti_armv7_keystone2.h          | 2 +-
 scripts/config_whitelist.txt                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h
index 21cac6ea312a..f191c909f41f 100644
--- a/arch/arm/include/asm/ti-common/keystone_net.h
+++ b/arch/arm/include/asm/ti-common/keystone_net.h
@@ -49,7 +49,7 @@
 
 #define KEYSTONE2_EMAC_GIG_ENABLE
 
-#define MAC_ID_BASE_ADDR		CONFIG_KSNET_MAC_ID_BASE
+#define MAC_ID_BASE_ADDR		CFG_KSNET_MAC_ID_BASE
 
 /* MDIO module input frequency */
 #ifdef CONFIG_SOC_K2G
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 479ab46e4edd..e46d635ca032 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -47,7 +47,7 @@
 #define CFG_SYS_SPI_CLK		ks_clk_get_rate(KS2_CLK1_6)
 
 /* Keystone net */
-#define CONFIG_KSNET_MAC_ID_BASE		KS2_MAC_ID_BASE_ADDR
+#define CFG_KSNET_MAC_ID_BASE		KS2_MAC_ID_BASE_ADDR
 #define CONFIG_KSNET_NETCP_BASE			KS2_NETCP_BASE
 #define CONFIG_KSNET_SERDES_SGMII_BASE		KS2_SGMII_SERDES_BASE
 #define CONFIG_KSNET_SERDES_SGMII2_BASE		KS2_SGMII_SERDES2_BASE
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ddcc89f508e1..031e72702307 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -88,7 +88,7 @@ CFG_KM_UBI_PARTITION_NAME_BOOT
 CFG_KM_UBI_PART_BOOT_OPTS
 CFG_KM_UIMAGE_NAME
 CFG_KSNET_CPSW_NUM_PORTS
-CONFIG_KSNET_MAC_ID_BASE
+CFG_KSNET_MAC_ID_BASE
 CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
 CONFIG_KSNET_NETCP_BASE
 CONFIG_KSNET_NETCP_V1_0
-- 
2.25.1



More information about the U-Boot mailing list