From 500545cc6b83958209128bffa825b3c842a21a4e Mon Sep 17 00:00:00 2001 From: wdenk Date: Thu, 6 Mar 2003 14:23:06 +0000 Subject: Fix problem with default #defines Cleanup compiler warning --- include/environment.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'include/environment.h') diff --git a/include/environment.h b/include/environment.h index fe8465b96..bb109649f 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 -- cgit v1.2.3