Mercurial > ecos
changeset 2258:19ce76dd5f64
Fix compile error - from David Ho
| author | gthomas |
|---|---|
| date | Fri, 21 Jul 2006 13:55:44 +0000 |
| parents | 467fd46113f3 |
| children | f2a958322096 |
| files | packages/redboot/current/ChangeLog packages/redboot/current/src/flash.c |
| diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/redboot/current/ChangeLog +++ b/packages/redboot/current/ChangeLog @@ -1,3 +1,8 @@ +2006-07-21 David Ho <davidkwho@gmail.com> + + * src/flash.c (fis_start_update_directory): Fix build error when + redundant FIS selected and locking is not enabled/supported. + 2006-05-24 Gary Thomas <gary@mlbassoc.com> * src/net/net_io.c (do_ip_addr): Bail out if no networking.
--- a/packages/redboot/current/src/flash.c +++ b/packages/redboot/current/src/flash.c @@ -248,12 +248,14 @@ fis_lookup(char *name, int *num) int fis_start_update_directory(int autolock) { #ifdef CYGOPT_REDBOOT_REDUNDANT_FIS +#ifdef CYGHWR_IO_FLASH_BLOCK_LOCKING #ifdef CYGSEM_REDBOOT_FLASH_LOCK_SPECIAL // Ensure [quietly] that the directory is unlocked before trying to update and locked again afterwards int do_autolock=1; #else int do_autolock=autolock; #endif +#endif struct fis_image_desc* img=NULL; void* err_addr=NULL; @@ -273,8 +275,10 @@ int fis_start_update_directory(int autol img->u.valid_info.version_count=img->u.valid_info.version_count+1; //ready to go.... +#ifdef CYGHWR_IO_FLASH_BLOCK_LOCKING if (do_autolock) flash_unlock((void *)fis_addr, fisdir_size, (void **)&err_addr); +#endif flash_erase(fis_addr, fisdir_size, (void **)&err_addr); //now magic is 0xffffffff