Mercurial > nand-ecoscentric
changeset 1627:1bf3513602bc
Fix CRC checking on load
| author | gthomas |
|---|---|
| date | Wed, 05 May 2004 10:44:30 +0000 |
| parents | 08e81f0c1712 |
| children | 2e1811d4f88c |
| files | packages/redboot/current/ChangeLog packages/redboot/current/src/flash.c |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/redboot/current/ChangeLog +++ b/packages/redboot/current/ChangeLog @@ -1,3 +1,8 @@ +2004-05-05 Gary Thomas <gary@mlbassoc.com> + + * src/flash.c (fis_load): CRC check on load was broken (the CDL + option changed names) + 2004-04-29 Jonathan Larmour <jifl@eCosCentric.com> * doc/redboot_epilogue.sgml: Comment out </part> to reflect change
--- a/packages/redboot/current/src/flash.c +++ b/packages/redboot/current/src/flash.c @@ -983,11 +983,11 @@ fis_load(int argc, char *argv[]) bool mem_addr_set = false; bool show_cksum = false; struct option_info opts[3]; -#ifdef CYGPKG_REDBOOT_FIS_CRC_CHECK +#if defined(CYGSEM_REDBOOT_FIS_CRC_CHECK) unsigned long cksum; #endif int num_options; -#ifdef CYGPRI_REDBOOT_ZLIB_FLASH +#if defined(CYGPRI_REDBOOT_ZLIB_FLASH) || defined(CYGSEM_REDBOOT_FIS_CRC_CHECK) bool decompress = false; #endif void *err_addr; @@ -1066,7 +1066,7 @@ fis_load(int argc, char *argv[]) } entry_address = (unsigned long)img->entry_point; -#ifdef CYGPKG_REDBOOT_FIS_CRC_CHECK +#ifdef CYGSEM_REDBOOT_FIS_CRC_CHECK cksum = cyg_crc32((unsigned char *)mem_addr, img->data_length); if (show_cksum) { diag_printf("Checksum: 0x%08lx\n", cksum);