projects
/
fw
/
stlink
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:UweBonnes/stlink
[fw/stlink]
/
flash
/
main.c
diff --git
a/flash/main.c
b/flash/main.c
index f838d923268aa22594cf3a6c8c8164734e303d73..24287456b41e283abc6624711267532b4de83fd9 100644
(file)
--- a/
flash/main.c
+++ b/
flash/main.c
@@
-154,6
+154,12
@@
int main(int ac, char** av)
}
else /* read */
{
}
else /* read */
{
+ if ((o.addr >= sl->flash_base) &&
+ (o.addr < sl->flash_base + sl->flash_size))
+ o.size = sl->flash_size;
+ else if ((o.addr >= sl->sram_base) &&
+ (o.addr < sl->sram_base + sl->sram_size))
+ o.size = sl->sram_size;
err = stlink_fread(sl, o.filename, o.addr, o.size);
if (err == -1)
{
err = stlink_fread(sl, o.filename, o.addr, o.size);
if (err == -1)
{