diff options
| author | wdenk <wdenk> | 2003-03-06 14:23:06 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-03-06 14:23:06 +0000 |
| commit | 500545cc6b83958209128bffa825b3c842a21a4e (patch) | |
| tree | 10c2bfdfb0bddd973b38e4bea98c638e5d1e04bc | |
| parent | 47cd00fa707af9de76408b69d3e911717dbbfab1 (diff) | |
| download | u-boot-imx-500545cc6b83958209128bffa825b3c842a21a4e.zip u-boot-imx-500545cc6b83958209128bffa825b3c842a21a4e.tar.gz u-boot-imx-500545cc6b83958209128bffa825b3c842a21a4e.tar.bz2 | |
Fix problem with default #defines
Cleanup compiler warning
| -rw-r--r-- | common/env_flash.c | 4 | ||||
| -rw-r--r-- | include/environment.h | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/common/env_flash.c b/common/env_flash.c index 19e2282..426d01b 100644 --- a/common/env_flash.c +++ b/common/env_flash.c @@ -160,9 +160,11 @@ int env_init(void) #ifdef CMD_SAVEENV int saveenv(void) { + char *saved_data = NULL; int rc = 1; +#if CFG_ENV_SECT_SIZE > CFG_ENV_SIZE ulong up_data = 0; - char *saved_data = NULL; +#endif debug ("Protect off %08lX ... %08lX\n", (ulong)flash_addr, end_addr); diff --git a/include/environment.h b/include/environment.h index fe8465b..bb10964 100644 --- a/include/environment.h +++ b/include/environment.h @@ -47,8 +47,15 @@ # if !defined(CFG_ENV_ADDR_REDUND) && defined(CFG_ENV_OFFSET_REDUND) # define CFG_ENV_ADDR_REDUND (CFG_FLASH_BASE + CFG_ENV_OFFSET_REDUND) # endif -# ifndef CFG_ENV_SIZE -# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE +# if defined(CFG_ENV_SECT_SIZE) || defined(CFG_ENV_SIZE) +# ifndef CFG_ENV_SECT_SIZE +# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE +# endif +# ifndef CFG_ENV_SIZE +# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE +# endif +# else +# error "Both CFG_ENV_SECT_SIZE and CFG_ENV_SIZE undefined" # endif # if defined(CFG_ENV_ADDR_REDUND) && !defined(CFG_ENV_SIZE_REDUND) # define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE |