aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-09-16 21:07:28 +0000
committerwdenk <wdenk>2003-09-16 21:07:28 +0000
commit34b3049a60a37e180d73332ccddf706c049a0515 (patch)
tree34dcc3a7d162e1e0df4ff5eb65348a76cf21038c
parentef709e923038ae702535a3dcbdb45a1b4cd6105c (diff)
downloadu-boot-linaro-stable-34b3049a60a37e180d73332ccddf706c049a0515.tar.gz
-rw-r--r--board/mpl/vcma9/vcma9.c2
-rw-r--r--board/sixnet/sixnet.c2
-rw-r--r--drivers/smc91111.c4
3 files changed, 3 insertions, 5 deletions
diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c
index 33cec0252..cdf6163c8 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 63c57c93f..42d149704 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 d0cb695c4..3146ff4c9 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) */