From 34b3049a60a37e180d73332ccddf706c049a0515 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Tue, 16 Sep 2003 21:07:28 +0000
Subject: [PATCH] Code cleanup

---
 board/mpl/vcma9/vcma9.c | 2 ++
 board/sixnet/sixnet.c   | 2 +-
 drivers/smc91111.c      | 4 ----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c
index 33cec02529..cdf6163c8c 100644
--- a/board/mpl/vcma9/vcma9.c
+++ b/board/mpl/vcma9/vcma9.c
@@ -218,6 +218,7 @@ static u8 Get_PLD_Revision(void)
 	return(Get_PLD_ID() & 0x0F);
 }
 
+#if 0	/* not used */
 static int Get_Board_Config(void)
 {
 	u8 config = Get_PLD_BOARD() & 0x03;
@@ -227,6 +228,7 @@ static int Get_Board_Config(void)
 	else
 	    return 0;
 }
+#endif
 
 static uchar Get_Board_PCB(void)
 {
diff --git a/board/sixnet/sixnet.c b/board/sixnet/sixnet.c
index 63c57c93f9..42d1497040 100644
--- a/board/sixnet/sixnet.c
+++ b/board/sixnet/sixnet.c
@@ -330,7 +330,7 @@ int misc_init_r (void)
 #if (CONFIG_COMMANDS & CFG_CMD_NAND)
 void nand_init(void)
 {
-	unsigned long totlen = nand_probe(CFG_NAND_BASE);
+	unsigned long totlen = nand_probe(CFG_DFLASH_BASE);
 
 	printf ("%4lu MB\n", totlen >> 20);
 }
diff --git a/drivers/smc91111.c b/drivers/smc91111.c
index d0cb695c4f..3146ff4c9e 100644
--- a/drivers/smc91111.c
+++ b/drivers/smc91111.c
@@ -1406,9 +1406,6 @@ int smc_get_ethaddr (bd_t * bd)
 
 	if (env_present && rom_valid) {	/* if both env and ROM are good */
 		if (memcmp (v_env_mac, v_rom_mac, 6) != 0) {
-			printf ("\n*** Warning: Environment and ROM MAC addresses don't match\n");
-			printf ("***          Using Environment MAC\n");
-			-----
 			printf ("\nWarning: MAC addresses don't match:\n");
 			printf ("\tHW MAC address:  "
 				"%02X:%02X:%02X:%02X:%02X:%02X\n",
@@ -1421,7 +1418,6 @@ int smc_get_ethaddr (bd_t * bd)
 				v_env_mac[2], v_env_mac[3],
 				v_env_mac[4], v_env_mac[5]) ;
 			debug ("### Set MAC addr from environment\n");
-			memcpy (addr, env_enetaddr, 6);
 		}
 	}
 	memcpy (bd->bi_enetaddr, v_mac, 6);	/* update global address to match env (allows env changing) */
-- 
2.39.5