Mercurial > flash_v2
comparison packages/redboot/current/src/flash.c @ 310:113a540ea6db
Improve FLASH create - from Thomas Koeller
| author | gthomas |
|---|---|
| date | Tue, 27 Aug 2002 11:06:48 +0000 |
| parents | 906a5d289c6d |
| children | 38dad94e75ce |
comparison
equal
deleted
inserted
replaced
| 309:59d0679e58c3 | 310:113a540ea6db |
|---|---|
| 725 } | 725 } |
| 726 if (!verify_action("An image named '%s' exists", name)) { | 726 if (!verify_action("An image named '%s' exists", name)) { |
| 727 return; | 727 return; |
| 728 } else { | 728 } else { |
| 729 if (defaults_assumed) { | 729 if (defaults_assumed) { |
| 730 if (!verify_action("* CAUTION * about to program '%s'\n at %p..%p from %p", | 730 if (no_copy && |
| 731 !verify_action("* CAUTION * about to program '%s'\n at %p..%p from %p", | |
| 731 name, (void *)flash_addr, (void *)(flash_addr+img_size-1), | 732 name, (void *)flash_addr, (void *)(flash_addr+img_size-1), |
| 732 (void *)mem_addr)) { | 733 (void *)mem_addr)) { |
| 733 return; // The guy gave up | 734 return; // The guy gave up |
| 734 } | 735 } |
| 735 } | 736 } |
| 884 if (!mem_addr_set) { | 885 if (!mem_addr_set) { |
| 885 mem_addr = img->mem_base; | 886 mem_addr = img->mem_base; |
| 886 } | 887 } |
| 887 // Load image from FLASH into RAM | 888 // Load image from FLASH into RAM |
| 888 if ((mem_addr < (CYG_ADDRESS)user_ram_start) || | 889 if ((mem_addr < (CYG_ADDRESS)user_ram_start) || |
| 889 ((mem_addr+img->size) >= (CYG_ADDRESS)user_ram_end)) { | 890 ((mem_addr+img->data_length) >= (CYG_ADDRESS)user_ram_end)) { |
| 890 diag_printf("Not a loadable image\n"); | 891 diag_printf("Not a loadable image\n"); |
| 891 return; | 892 return; |
| 892 } | 893 } |
| 893 #ifdef CYGPKG_COMPRESS_ZLIB | 894 #ifdef CYGPKG_COMPRESS_ZLIB |
| 894 if (decompress) { | 895 if (decompress) { |
