summaryrefslogtreecommitdiff
path: root/cpu/mpc8220/fec.c
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-12-31 09:32:47 +0000
committerwdenk <wdenk>2004-12-31 09:32:47 +0000
commite2ffd59b4d93c9149de1caaa087371b0cfc512c9 (patch)
tree86cfb6e30bec1686253b0542d76f57c5d62d183a /cpu/mpc8220/fec.c
parent400ab719c6025c176c50bcdff342384222d7424b (diff)
downloadu-boot-imx-e2ffd59b4d93c9149de1caaa087371b0cfc512c9.zip
u-boot-imx-e2ffd59b4d93c9149de1caaa087371b0cfc512c9.tar.gz
u-boot-imx-e2ffd59b4d93c9149de1caaa087371b0cfc512c9.tar.bz2
* Code cleanup, mostly for GCC-3.3.x
* Cleanup confusing use of CONFIG_ETH*ADDR - ust his only to pre-define a MAC address; use CONFIG_HAS_ETH* to enable support for additional ethernet addresses. * Cleanup drivers/i82365.c - avoid duplication of code * Fix bogus "cannot span across banks" flash error message * Add support for CompactFlash for the CPC45 Board.
Diffstat (limited to 'cpu/mpc8220/fec.c')
-rw-r--r--cpu/mpc8220/fec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpu/mpc8220/fec.c b/cpu/mpc8220/fec.c
index 1bc51cd..96228e5 100644
--- a/cpu/mpc8220/fec.c
+++ b/cpu/mpc8220/fec.c
@@ -809,14 +809,14 @@ int mpc8220_fec_initialize (bd_t * bis)
{
mpc8220_fec_priv *fec;
-#ifdef CONFIG_ETH1ADDR
+#ifdef CONFIG_HAS_ETH1
mpc8220_fec_priv *fec2;
#endif
struct eth_device *dev;
char *tmp, *end;
char env_enetaddr[6];
-#ifdef CONFIG_ETH1ADDR
+#ifdef CONFIG_HAS_ETH1
char env_enet1addr[6];
#endif
int i;
@@ -826,7 +826,7 @@ int mpc8220_fec_initialize (bd_t * bis)
memset (dev, 0, sizeof *dev);
fec->eth = (ethernet_regs *) MMAP_FEC1;
-#ifdef CONFIG_ETH1ADDR
+#ifdef CONFIG_HAS_ETH1
fec2 = (mpc8220_fec_priv *) malloc (sizeof (*fec));
fec2->eth = (ethernet_regs *) MMAP_FEC2;
#endif
@@ -860,7 +860,7 @@ int mpc8220_fec_initialize (bd_t * bis)
}
mpc8220_fec_set_hwaddr (fec, env_enetaddr);
}
-#ifdef CONFIG_ETH1ADDR
+#ifdef CONFIG_HAS_ETH1
tmp = getenv ("eth1addr");
if (tmp) {
for (i = 0; i < 6; i++) {