commit d730fbc30b2470c40b8bfc611787051f551b47f4
author wdenk <wdenk> Thu Mar 06 14:23:06 2003 +0000
committer wdenk <wdenk> Thu Mar 06 14:23:06 2003 +0000
tree 10c2bfdfb0bddd973b38e4bea98c638e5d1e04bc
parent cc1e256f97603c0823827bdda1701112331f01a3

Fix problem with default #defines
Cleanup compiler warning

include/environment.h

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