diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-07-15 22:48:46 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-07-15 22:48:46 +0200 |
| commit | 93502a5e0adcfc0ce6cf8e3daa7eb9a4f4e53658 (patch) | |
| tree | 85bf8677d8e8095ef18453199a99c5e4131d217d /include/environment.h | |
| parent | dce6538f5d21a0def8a4df5328d536abed3e136a (diff) | |
| parent | d6f324d03d7829a1da1dee8b60f91b173a3976f0 (diff) | |
Merge branch 'master' of ../master
Diffstat (limited to 'include/environment.h')
| -rw-r--r-- | include/environment.h | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/include/environment.h b/include/environment.h index 203f731967..fbccf6ab0c 100644 --- a/include/environment.h +++ b/include/environment.h @@ -74,15 +74,24 @@ #endif /* CONFIG_ENV_IS_IN_FLASH */ #if defined(CONFIG_ENV_IS_IN_NAND) -# ifndef CONFIG_ENV_OFFSET -# error "Need to define CONFIG_ENV_OFFSET when using CONFIG_ENV_IS_IN_NAND" -# endif +# if defined(CONFIG_ENV_OFFSET_OOB) +# ifdef CONFIG_ENV_OFFSET_REDUND +# error "CONFIG_ENV_OFFSET_REDUND is not supported when CONFIG_ENV_OFFSET_OOB" +# error "is set" +# endif +extern unsigned long nand_env_oob_offset; +# define CONFIG_ENV_OFFSET nand_env_oob_offset +# else +# ifndef CONFIG_ENV_OFFSET +# error "Need to define CONFIG_ENV_OFFSET when using CONFIG_ENV_IS_IN_NAND" +# endif +# ifdef CONFIG_ENV_OFFSET_REDUND +# define CONFIG_SYS_REDUNDAND_ENVIRONMENT +# endif +# endif /* CONFIG_ENV_OFFSET_OOB */ # ifndef CONFIG_ENV_SIZE # error "Need to define CONFIG_ENV_SIZE when using CONFIG_ENV_IS_IN_NAND" # endif -# ifdef CONFIG_ENV_OFFSET_REDUND -# define CONFIG_SYS_REDUNDAND_ENVIRONMENT -# endif #endif /* CONFIG_ENV_IS_IN_NAND */ #if defined(CONFIG_ENV_IS_IN_MG_DISK) |