[PoC 020/241] global: Migrate CONFIG_ETHBASE to CFG

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


Signed-off-by: Tom Rini <trini at konsulko.com>
---
 board/cadence/xtfpga/xtfpga.c | 2 +-
 include/configs/xtfpga.h      | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c
index f38f5564a06c..8e4081b4c6dd 100644
--- a/board/cadence/xtfpga/xtfpga.c
+++ b/board/cadence/xtfpga/xtfpga.c
@@ -89,7 +89,7 @@ int misc_init_r(void)
 	char *s = env_get("ethaddr");
 	if (s == 0) {
 		unsigned int x;
-		char s[] = __stringify(CONFIG_ETHBASE);
+		char s[] = __stringify(CFG_ETHBASE);
 		x = (*(volatile u32 *)CFG_SYS_FPGAREG_DIPSW)
 			& FPGAREG_MAC_MASK;
 		sprintf(&s[15], "%02x", x);
diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 9201dac7abce..6c5a9f566bee 100644
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -136,7 +136,7 @@
 /* Ethernet Driver Info */
 /*======================*/
 
-#define CONFIG_ETHBASE			00:50:C2:13:6f:00
+#define CFG_ETHBASE			00:50:C2:13:6f:00
 #define CFG_SYS_ETHOC_BASE		IOADDR(0x0d030000)
 #define CFG_SYS_ETHOC_BUFFER_ADDR	IOADDR(0x0D800000)
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 81353fa94e7c..99b3796584d0 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -20,7 +20,7 @@ CFG_ENV_SETTINGS_V2
 CFG_ENV_SROM_BANK
 CFG_ENV_TOTAL_SIZE
 CFG_ET1100_BASE
-CONFIG_ETHBASE
+CFG_ETHBASE
 CONFIG_EXTRA_ENV_SETTINGS
 CONFIG_FB_ADDR
 CONFIG_FDTADDR
-- 
2.25.1



More information about the U-Boot mailing list