[PoC 005/241] global: Migrate CONFIG_DM9000_BASE to CFG

Tom Rini
2022-11-20T13:35:17Z

board/timll/devkit8000/devkit8000.c | 4 ++--
include/configs/M5253DEMO.h | 6 +++---
include/configs/at91sam9261ek.h | 6 +++---
include/configs/ci20.h | 6 +++---
include/configs/devkit8000.h | 6 +++---
scripts/config_whitelist.txt | 2 +-
6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index 0808ca1a54c0..39103de02ed4 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -79,7 +79,7 @@ int board_init(void)
static void gpmc_dm9000_config(void)
{
enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6],
- CONFIG_DM9000_BASE, GPMC_SIZE_16M);
+ CFG_DM9000_BASE, GPMC_SIZE_16M);
}

/*
@@ -102,7 +102,7 @@ int misc_init_r(void)
#ifdef CONFIG_DRIVER_DM9000
/* Configure GPMC registers for DM9000 */
enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6],
- CONFIG_DM9000_BASE, GPMC_SIZE_16M);
+ CFG_DM9000_BASE, GPMC_SIZE_16M);

/* Use OMAP DIE_ID as MAC address */
if (!eth_env_get_enetaddr("ethaddr", enetaddr)) {
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 7e37c6d11997..223a843fc695 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -20,9 +20,9 @@
env/embedded.o(.text*);

#ifdef CONFIG_DRIVER_DM9000
-# define CONFIG_DM9000_BASE (CFG_SYS_CS1_BASE | 0x300)
-# define DM9000_IO CONFIG_DM9000_BASE
-# define DM9000_DATA (CONFIG_DM9000_BASE + 4)
+# define CFG_DM9000_BASE (CFG_SYS_CS1_BASE | 0x300)
+# define DM9000_IO CFG_DM9000_BASE
+# define DM9000_DATA (CFG_DM9000_BASE + 4)
# undef CONFIG_DM9000_DEBUG
# define CONFIG_DM9000_BYTE_SWAPPED

diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 56247e390bf6..d58c0f4bbe24 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -35,9 +35,9 @@
#endif

/* Ethernet */
-#define CONFIG_DM9000_BASE 0x30000000
-#define DM9000_IO CONFIG_DM9000_BASE
-#define DM9000_DATA (CONFIG_DM9000_BASE + 4)
+#define CFG_DM9000_BASE 0x30000000
+#define DM9000_IO CFG_DM9000_BASE
+#define DM9000_DATA (CFG_DM9000_BASE + 4)
#define CONFIG_DM9000_USE_16BIT
#define CONFIG_DM9000_NO_SROM

diff --git a/include/configs/ci20.h b/include/configs/ci20.h
index 3329c24fa68c..bc8b699b84f8 100644
--- a/include/configs/ci20.h
+++ b/include/configs/ci20.h
@@ -18,9 +18,9 @@
#define CFG_SYS_NS16550_CLK 48000000

/* Ethernet: davicom DM9000 */
-#define CONFIG_DM9000_BASE 0xb6000000
-#define DM9000_IO CONFIG_DM9000_BASE
-#define DM9000_DATA (CONFIG_DM9000_BASE + 2)
+#define CFG_DM9000_BASE 0xb6000000
+#define DM9000_IO CFG_DM9000_BASE
+#define DM9000_DATA (CFG_DM9000_BASE + 2)

/* Miscellaneous configuration options */

diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 46410595c2bc..824e0e448eea 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -18,9 +18,9 @@

/* Hardware drivers */
/* DM9000 */
-#define CONFIG_DM9000_BASE 0x2c000000
-#define DM9000_IO CONFIG_DM9000_BASE
-#define DM9000_DATA (CONFIG_DM9000_BASE + 0x400)
+#define CFG_DM9000_BASE 0x2c000000
+#define DM9000_IO CFG_DM9000_BASE
+#define DM9000_DATA (CFG_DM9000_BASE + 0x400)
#define CONFIG_DM9000_USE_16BIT 1
#define CONFIG_DM9000_NO_SROM 1
#undef CONFIG_DM9000_DEBUG
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 414f0078e4d7..7c6fc0a07bf7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -5,7 +5,7 @@ CFG_DFU_ALT_BOOT_EMMC
CFG_DFU_ALT_BOOT_SD
CFG_DFU_ALT_SYSTEM
CFG_DFU_ENV_SETTINGS
-CONFIG_DM9000_BASE
+CFG_DM9000_BASE
CONFIG_DM9000_BYTE_SWAPPED
CONFIG_DM9000_NO_SROM
CONFIG_DM9000_USE_16BIT
--
2.25.1