@@ -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)) {
@@ -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
@@ -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
@@ -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 */
@@ -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
@@ -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
Signed-off-by: Tom Rini <trini@konsulko.com> --- 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(-)