mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-30 08:30:50 +09:00
cmd_sf|env_sf: Fix code cleanup
- line over 80 characters - add tabs - CHECK: Alignment should match open parenthesis Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
This commit is contained in:
parent
fd35ca5c20
commit
402ba1e3a0
@ -151,12 +151,12 @@ static const char *spi_flash_update_block(struct spi_flash *flash, u32 offset,
|
|||||||
size_t len, const char *buf, char *cmp_buf, size_t *skipped)
|
size_t len, const char *buf, char *cmp_buf, size_t *skipped)
|
||||||
{
|
{
|
||||||
debug("offset=%#x, sector_size=%#x, len=%#zx\n",
|
debug("offset=%#x, sector_size=%#x, len=%#zx\n",
|
||||||
offset, flash->sector_size, len);
|
offset, flash->sector_size, len);
|
||||||
if (spi_flash_read(flash, offset, len, cmp_buf))
|
if (spi_flash_read(flash, offset, len, cmp_buf))
|
||||||
return "read";
|
return "read";
|
||||||
if (memcmp(cmp_buf, buf, len) == 0) {
|
if (memcmp(cmp_buf, buf, len) == 0) {
|
||||||
debug("Skip region %x size %zx: no change\n",
|
debug("Skip region %x size %zx: no change\n",
|
||||||
offset, len);
|
offset, len);
|
||||||
*skipped += len;
|
*skipped += len;
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@ -200,7 +200,7 @@ static int spi_flash_update(struct spi_flash *flash, u32 offset,
|
|||||||
todo = min(end - buf, flash->sector_size);
|
todo = min(end - buf, flash->sector_size);
|
||||||
if (get_timer(last_update) > 100) {
|
if (get_timer(last_update) > 100) {
|
||||||
printf(" \rUpdating, %zu%% %lu B/s",
|
printf(" \rUpdating, %zu%% %lu B/s",
|
||||||
100 - (end - buf) / scale,
|
100 - (end - buf) / scale,
|
||||||
bytes_per_second(buf - start_buf,
|
bytes_per_second(buf - start_buf,
|
||||||
start_time));
|
start_time));
|
||||||
last_update = get_timer(0);
|
last_update = get_timer(0);
|
||||||
@ -220,9 +220,9 @@ static int spi_flash_update(struct spi_flash *flash, u32 offset,
|
|||||||
|
|
||||||
delta = get_timer(start_time);
|
delta = get_timer(start_time);
|
||||||
printf("%zu bytes written, %zu bytes skipped", len - skipped,
|
printf("%zu bytes written, %zu bytes skipped", len - skipped,
|
||||||
skipped);
|
skipped);
|
||||||
printf(" in %ld.%lds, speed %ld B/s\n",
|
printf(" in %ld.%lds, speed %ld B/s\n",
|
||||||
delta / 1000, delta % 1000, bytes_per_second(len, start_time));
|
delta / 1000, delta % 1000, bytes_per_second(len, start_time));
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -252,7 +252,7 @@ static int do_spi_flash_read_write(int argc, char * const argv[])
|
|||||||
/* Consistency checking */
|
/* Consistency checking */
|
||||||
if (offset + len > flash->size) {
|
if (offset + len > flash->size) {
|
||||||
printf("ERROR: attempting %s past flash size (%#x)\n",
|
printf("ERROR: attempting %s past flash size (%#x)\n",
|
||||||
argv[0], flash->size);
|
argv[0], flash->size);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -262,9 +262,9 @@ static int do_spi_flash_read_write(int argc, char * const argv[])
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strcmp(argv[0], "update") == 0)
|
if (strcmp(argv[0], "update") == 0) {
|
||||||
ret = spi_flash_update(flash, offset, len, buf);
|
ret = spi_flash_update(flash, offset, len, buf);
|
||||||
else if (strncmp(argv[0], "read", 4) == 0 ||
|
} else if (strncmp(argv[0], "read", 4) == 0 ||
|
||||||
strncmp(argv[0], "write", 5) == 0) {
|
strncmp(argv[0], "write", 5) == 0) {
|
||||||
int read;
|
int read;
|
||||||
|
|
||||||
@ -275,7 +275,7 @@ static int do_spi_flash_read_write(int argc, char * const argv[])
|
|||||||
ret = spi_flash_write(flash, offset, len, buf);
|
ret = spi_flash_write(flash, offset, len, buf);
|
||||||
|
|
||||||
printf("SF: %zu bytes @ %#x %s: %s\n", (size_t)len, (u32)offset,
|
printf("SF: %zu bytes @ %#x %s: %s\n", (size_t)len, (u32)offset,
|
||||||
read ? "Read" : "Written", ret ? "ERROR" : "OK");
|
read ? "Read" : "Written", ret ? "ERROR" : "OK");
|
||||||
}
|
}
|
||||||
|
|
||||||
unmap_physmem(buf, len);
|
unmap_physmem(buf, len);
|
||||||
@ -304,13 +304,13 @@ static int do_spi_flash_erase(int argc, char * const argv[])
|
|||||||
/* Consistency checking */
|
/* Consistency checking */
|
||||||
if (offset + len > flash->size) {
|
if (offset + len > flash->size) {
|
||||||
printf("ERROR: attempting %s past flash size (%#x)\n",
|
printf("ERROR: attempting %s past flash size (%#x)\n",
|
||||||
argv[0], flash->size);
|
argv[0], flash->size);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = spi_flash_erase(flash, offset, len);
|
ret = spi_flash_erase(flash, offset, len);
|
||||||
printf("SF: %zu bytes @ %#x Erased: %s\n", (size_t)len, (u32)offset,
|
printf("SF: %zu bytes @ %#x Erased: %s\n", (size_t)len, (u32)offset,
|
||||||
ret ? "ERROR" : "OK");
|
ret ? "ERROR" : "OK");
|
||||||
|
|
||||||
return ret == 0 ? 0 : 1;
|
return ret == 0 ? 0 : 1;
|
||||||
}
|
}
|
||||||
@ -470,7 +470,8 @@ static int do_spi_flash_test(int argc, char * const argv[])
|
|||||||
}
|
}
|
||||||
#endif /* CONFIG_CMD_SF_TEST */
|
#endif /* CONFIG_CMD_SF_TEST */
|
||||||
|
|
||||||
static int do_spi_flash(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
static int do_spi_flash(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
|
char * const argv[])
|
||||||
{
|
{
|
||||||
const char *cmd;
|
const char *cmd;
|
||||||
int ret;
|
int ret;
|
||||||
@ -526,7 +527,7 @@ U_BOOT_CMD(
|
|||||||
"SPI flash sub-system",
|
"SPI flash sub-system",
|
||||||
"probe [[bus:]cs] [hz] [mode] - init flash device on given SPI bus\n"
|
"probe [[bus:]cs] [hz] [mode] - init flash device on given SPI bus\n"
|
||||||
" and chip select\n"
|
" and chip select\n"
|
||||||
"sf read addr offset len - read `len' bytes starting at\n"
|
"sf read addr offset len - read `len' bytes starting at\n"
|
||||||
" `offset' to memory at `addr'\n"
|
" `offset' to memory at `addr'\n"
|
||||||
"sf write addr offset len - write `len' bytes from memory\n"
|
"sf write addr offset len - write `len' bytes from memory\n"
|
||||||
" at `addr' to flash at `offset'\n"
|
" at `addr' to flash at `offset'\n"
|
||||||
|
Loading…
Reference in New Issue
Block a user