From e2ffd59b4d93c9149de1caaa087371b0cfc512c9 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Fri, 31 Dec 2004 09:32:47 +0000
Subject: * 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.
---
 lib_ppc/board.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib_ppc/board.c')

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index cc9b479..c6f5b18 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -805,7 +805,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	load_sernum_ethaddr ();
 #endif
 
-#if defined(CONFIG_ETH1ADDR)
+#ifdef CONFIG_HAS_ETH1
 	/* handle the 2nd ethernet address */
 
 	s = getenv ("eth1addr");
@@ -816,7 +816,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 			s = (*e) ? e + 1 : e;
 	}
 #endif
-#if defined(CONFIG_ETH2ADDR)
+#ifdef CONFIG_HAS_ETH2
 	/* handle the 3rd ethernet address */
 
 	s = getenv ("eth2addr");
@@ -832,7 +832,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	}
 #endif
 
-#if defined(CONFIG_ETH3ADDR)
+#ifdef CONFIG_HAS_ETH3
 	/* handle 4th ethernet address */
 	s = getenv("eth3addr");
 #if defined(CONFIG_XPEDITE1K)
-- 
cgit v1.1