Code cleanup

diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c
index 33cec02529161749ef8f265d6a76665508241b2a..cdf6163c8c57a1d872c260f685f11b9537071322 100644 (file)
--- 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 63c57c93f92f607e006221a35979b4b0020f3a69..42d14970403656844b12169cd7f2940c447f65a5 100644 (file)
--- 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 d0cb695c4fc477eb70f25629245edb513d08e36e..3146ff4c9ea90ed6b7f553bdcd77344061c85a85 100644 (file)
--- 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) */