Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-21 15:12:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Code cleanup

Browse source
This commit is contained in:
wdenk 2003-09-16 21:07:28 +00:00
parent ef709e9230
commit 34b3049a60
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
board/mpl/vcma9/vcma9.c
View file

@ -218,6 +218,7 @@ static u8 Get_PLD_Revision(void)
return(Get_PLD_ID() & 0x0F); return(Get_PLD_ID() & 0x0F);
} }
#if 0 /* not used */
static int Get_Board_Config(void) static int Get_Board_Config(void)
{ {
u8 config = Get_PLD_BOARD() & 0x03; u8 config = Get_PLD_BOARD() & 0x03;
@ -227,6 +228,7 @@ static int Get_Board_Config(void)
else else
return 0; return 0;
} }
#endif
static uchar Get_Board_PCB(void) static uchar Get_Board_PCB(void)
{ {

2
board/sixnet/sixnet.c
View file

@ -330,7 +330,7 @@ int misc_init_r (void)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) #if (CONFIG_COMMANDS & CFG_CMD_NAND)
void nand_init(void) 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); printf ("%4lu MB\n", totlen >> 20);
} }

4
drivers/smc91111.c
View file

@ -1406,9 +1406,6 @@ int smc_get_ethaddr (bd_t * bd)
if (env_present && rom_valid) { /* if both env and ROM are good */ if (env_present && rom_valid) { /* if both env and ROM are good */
if (memcmp (v_env_mac, v_rom_mac, 6) != 0) { 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 ("\nWarning: MAC addresses don't match:\n");
printf ("\tHW MAC address: " printf ("\tHW MAC address: "
"%02X:%02X:%02X:%02X:%02X:%02X\n", "%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[2], v_env_mac[3],
v_env_mac[4], v_env_mac[5]) ; v_env_mac[4], v_env_mac[5]) ;
debug ("### Set MAC addr from environment\n"); 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) */ memcpy (bd->bi_enetaddr, v_mac, 6); /* update global address to match env (allows env changing) */