setserial: fix error message and rename var serialnumber -> serial_number

This commit is contained in:
Alexander Couzens 2015-04-06 18:23:11 +02:00
parent 2a21e331db
commit a32bdf95de
1 changed files with 8 additions and 6 deletions

View File

@ -245,14 +245,14 @@ int do_setserial(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
u8 buffer[CFG_FLASH_SECTOR_SIZE]; u8 buffer[CFG_FLASH_SECTOR_SIZE];
int32_t *serial; int32_t *serial;
int32_t serialnumber; int32_t serial_number;
int rc; int rc;
if (argc != 2) if (argc != 2)
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
serialnumber = skip_atoi(argv[1]); serial_number = skip_atoi(argv[1]);
if (serialnumber <= 0) { if (serial_number <= 0) {
printf("Invalid serialnumber. <= 0!\n"); printf("Invalid serialnumber. <= 0!\n");
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
} }
@ -262,22 +262,24 @@ int do_setserial(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
/* set serial number */ /* set serial number */
serial = (int32_t *) (buffer + SERIAL_LOCATION); serial = (int32_t *) (buffer + SERIAL_LOCATION);
*serial = serialnumber; *serial = serial_number;
/* erase */ /* erase */
rc = flash_erase(flash_info, CAL_SECTOR, CAL_SECTOR); rc = flash_erase(flash_info, CAL_SECTOR, CAL_SECTOR);
if (rc) { if (rc) {
printf("Write mac failed because flash_erase failed! rc %d\n", rc); printf("Write serial failed because flash_erase failed! rc %d\n", rc);
return 1; return 1;
} }
/* write */ /* write */
rc = write_buff(flash_info, buffer, BOARDCAL, CFG_FLASH_SECTOR_SIZE); rc = write_buff(flash_info, buffer, BOARDCAL, CFG_FLASH_SECTOR_SIZE);
if (rc) { if (rc) {
printf("Write mac failed because write_buff failed! rc %d\n", rc); printf("Write serial failed because write_buff failed! rc %d\n", rc);
return 1; return 1;
} }
printf("Set serial to %d\n", serial_number);
return CMD_RET_SUCCESS; return CMD_RET_SUCCESS;
} }