Mercurial > flash_v2
changeset 310:113a540ea6db
Improve FLASH create - from Thomas Koeller
| author | gthomas |
|---|---|
| date | Tue, 27 Aug 2002 11:06:48 +0000 |
| parents | 59d0679e58c3 |
| children | c0ffaecb376e |
| files | packages/redboot/current/ChangeLog packages/redboot/current/src/flash.c |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/redboot/current/ChangeLog +++ b/packages/redboot/current/ChangeLog @@ -1,3 +1,10 @@ +2002-08-26 Thomas Koeller <thomas@koeller.dyndns.org> + + * src/flash.c: Do not warn about overwriting image data if + -n option is used with 'fis create'. For 'fis load', + perform load size check based on actual data length, not + image size. + 2002-08-22 Mark Salter <msalter@redhat.com> * src/net/net_io.c (net_io_putc): Don't flush on every \n.
--- a/packages/redboot/current/src/flash.c +++ b/packages/redboot/current/src/flash.c @@ -727,7 +727,8 @@ fis_create(int argc, char *argv[]) return; } else { if (defaults_assumed) { - if (!verify_action("* CAUTION * about to program '%s'\n at %p..%p from %p", + if (no_copy && + !verify_action("* CAUTION * about to program '%s'\n at %p..%p from %p", name, (void *)flash_addr, (void *)(flash_addr+img_size-1), (void *)mem_addr)) { return; // The guy gave up @@ -886,7 +887,7 @@ fis_load(int argc, char *argv[]) } // Load image from FLASH into RAM if ((mem_addr < (CYG_ADDRESS)user_ram_start) || - ((mem_addr+img->size) >= (CYG_ADDRESS)user_ram_end)) { + ((mem_addr+img->data_length) >= (CYG_ADDRESS)user_ram_end)) { diag_printf("Not a loadable image\n"); return; }