mirror of
https://github.com/smaeul/u-boot.git
synced 2025-10-14 04:46:01 +01:00
sf: Query write-protection status before operating the flash
Do not suggest successful operation if a flash area to be changed is actually locked, thus will not execute the request. Rather report an error and bail out. That's way more user-friendly than asking them to manually check for this case. Derived from original patch by Chao Zeng. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
parent
513c6071ce
commit
f3a56dda88
12
cmd/sf.c
12
cmd/sf.c
@ -294,6 +294,12 @@ static int do_spi_flash_read_write(int argc, char *const argv[])
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (strncmp(argv[0], "read", 4) != 0 && flash->flash_is_unlocked &&
|
||||||
|
!flash->flash_is_unlocked(flash, offset, len)) {
|
||||||
|
printf("ERROR: flash area is locked\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
buf = map_physmem(addr, len, MAP_WRBACK);
|
buf = map_physmem(addr, len, MAP_WRBACK);
|
||||||
if (!buf && addr) {
|
if (!buf && addr) {
|
||||||
puts("Failed to map physical memory\n");
|
puts("Failed to map physical memory\n");
|
||||||
@ -350,6 +356,12 @@ static int do_spi_flash_erase(int argc, char *const argv[])
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (flash->flash_is_unlocked &&
|
||||||
|
!flash->flash_is_unlocked(flash, offset, len)) {
|
||||||
|
printf("ERROR: flash area is locked\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
ret = spi_flash_erase(flash, offset, size);
|
ret = spi_flash_erase(flash, offset, size);
|
||||||
printf("SF: %zu bytes @ %#x Erased: ", (size_t)size, (u32)offset);
|
printf("SF: %zu bytes @ %#x Erased: ", (size_t)size, (u32)offset);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user