From a32bdf95deb7fb73685473092fa509f3260ab655 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Mon, 6 Apr 2015 18:23:11 +0200 Subject: [PATCH] setserial: fix error message and rename var serialnumber -> serial_number --- u-boot/common/cmd_setmac.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/u-boot/common/cmd_setmac.c b/u-boot/common/cmd_setmac.c index 2e7cae84d9..d592a9ab08 100644 --- a/u-boot/common/cmd_setmac.c +++ b/u-boot/common/cmd_setmac.c @@ -245,14 +245,14 @@ int do_setserial(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { u8 buffer[CFG_FLASH_SECTOR_SIZE]; int32_t *serial; - int32_t serialnumber; + int32_t serial_number; int rc; if (argc != 2) return CMD_RET_FAILURE; - serialnumber = skip_atoi(argv[1]); - if (serialnumber <= 0) { + serial_number = skip_atoi(argv[1]); + if (serial_number <= 0) { printf("Invalid serialnumber. <= 0!\n"); return CMD_RET_FAILURE; } @@ -262,22 +262,24 @@ int do_setserial(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) /* set serial number */ serial = (int32_t *) (buffer + SERIAL_LOCATION); - *serial = serialnumber; + *serial = serial_number; /* erase */ rc = flash_erase(flash_info, CAL_SECTOR, CAL_SECTOR); 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; } /* write */ rc = write_buff(flash_info, buffer, BOARDCAL, CFG_FLASH_SECTOR_SIZE); 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; } + printf("Set serial to %d\n", serial_number); + return CMD_RET_SUCCESS; }