phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

NetStar: eeprom - be less verbose 

Use shorter yet descriptive messages, replace printf() with
puts() where appropriate. This saves few bytes.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
This commit is contained in:
Ladislav Michl 2010-02-08 14:15:43 -05:00 committed by Tom Rix
parent b29ff62772
commit 308d463eaf
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
board/netstar/eeprom.c
View File

@ -48,7 +48,7 @@ static u16 read_eeprom_reg(u16 reg)
while ((SMC_inw(&dev, CTL_REG) & CTL_RELOAD) && --timeout) while ((SMC_inw(&dev, CTL_REG) & CTL_RELOAD) && --timeout)
udelay(100); udelay(100);
if (timeout == 0) { if (timeout == 0) {
printf("Timeout Reading EEPROM register %02x\n", reg); printf("Timeout reading register %02x\n", reg);
return 0; return 0;
} }
@ -73,7 +73,7 @@ static int write_eeprom_reg(u16 value, u16 reg)
while ((SMC_inw(&dev, CTL_REG) & CTL_STORE) && --timeout) while ((SMC_inw(&dev, CTL_REG) & CTL_STORE) && --timeout)
udelay(100); udelay(100);
if (timeout == 0) { if (timeout == 0) {
printf("Timeout Writing EEPROM register %02x\n", reg); printf("Timeout writing register %02x\n", reg);
return 0; return 0;
} }
@ -95,8 +95,7 @@ static int verify_macaddr(char *s)
u16 reg; u16 reg;
int i, err = 0; int i, err = 0;
printf("MAC Address: "); puts("HWaddr: ");
err = i = 0;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
reg = read_eeprom_reg(0x20 + i); reg = read_eeprom_reg(0x20 + i);
printf("%02x:%02x%c", reg & 0xff, reg >> 8, i != 2 ? ':' : '\n'); printf("%02x:%02x%c", reg & 0xff, reg >> 8, i != 2 ? ':' : '\n');
@ -156,15 +155,15 @@ int eeprom(int argc, char *argv[])
unsigned char buf[58], *p; unsigned char buf[58], *p;
app_startup(argv); app_startup(argv);
if (get_version() != XF_VERSION) { i = get_version();
printf("Wrong XF_VERSION.\n"); if (i != XF_VERSION) {
printf("Application expects ABI version %d\n", XF_VERSION); printf("Using ABI version %d, but U-Boot provides %d\n",
printf("Actual U-Boot ABI version %d\n", (int)get_version()); XF_VERSION, i);
return 1; return 1;
} }
if ((SMC_inw(&dev, BANK_SELECT) & 0xFF00) != 0x3300) { if ((SMC_inw(&dev, BANK_SELECT) & 0xFF00) != 0x3300) {
printf("SMSC91111 not found.\n"); puts("SMSC91111 not found\n");
return 2; return 2;
} }
@ -176,9 +175,9 @@ int eeprom(int argc, char *argv[])
/* Print help message */ /* Print help message */
if (argv[1][1] == 'h') { if (argv[1][1] == 'h') {
printf("NetStar EEPROM writer\n"); puts("NetStar EEPROM writer\n"
printf("Built: %s at %s\n", U_BOOT_DATE, U_BOOT_TIME); "Built: " U_BOOT_DATE " at " U_BOOT_TIME "\n"
printf("Usage:\n\t<mac_address> [<element_1>] [<...>]\n"); "Usage:\n\t<mac_address> [<element_1>] [<...>]\n");
return 0; return 0;
} }
@ -195,7 +194,7 @@ int eeprom(int argc, char *argv[])
printf("Element %d: odd character count\n", i - 1); printf("Element %d: odd character count\n", i - 1);
return 3; return 3;
case -3: case -3:
printf("Out of EEPROM memory\n"); puts("Out of EEPROM memory\n");
return 3; return 3;
default: default:
p += ret; p += ret;
@ -206,7 +205,7 @@ int eeprom(int argc, char *argv[])
/* First argument (MAC) is mandatory */ /* First argument (MAC) is mandatory */
set_mac(argv[1]); set_mac(argv[1]);
if (verify_macaddr(argv[1])) { if (verify_macaddr(argv[1])) {
printf("*** MAC address does not match! ***\n"); puts("*** HWaddr does not match! ***\n");
return 4; return 4;
} }