diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-11-27 22:49:46 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2006-11-27 22:49:46 +0100 |
| commit | 7de8354855138b9a5c621272a8278c1051b29738 (patch) | |
| tree | 01f85b3eae1b932e46401d6b66596edbf9e6291d | |
| parent | a5bfa2726bfb3811e18d9d1043a4876a5595eec3 (diff) | |
| parent | d1a72545296800b7e219f93104ad5836f0003d66 (diff) | |
| download | u-boot-imx-7de8354855138b9a5c621272a8278c1051b29738.zip u-boot-imx-7de8354855138b9a5c621272a8278c1051b29738.tar.gz u-boot-imx-7de8354855138b9a5c621272a8278c1051b29738.tar.bz2 | |
Merge with /home/sr/git/u-boot/nand-env
| -rw-r--r-- | include/configs/sequoia.h | 1 | ||||
| -rw-r--r-- | include/environment.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index 1a460cd..00b9222 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -102,6 +102,7 @@ #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #else #define CFG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */ +#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */ #endif /*----------------------------------------------------------------------- diff --git a/include/environment.h b/include/environment.h index 26b0712..af605ab 100644 --- a/include/environment.h +++ b/include/environment.h @@ -79,8 +79,7 @@ # ifdef CFG_ENV_OFFSET_REDUND # define CFG_REDUNDAND_ENVIRONMENT # endif -# if defined(CONFIG_NAND_U_BOOT) -/* Use embedded environment in NAND boot versions */ +# ifdef CFG_ENV_IS_EMBEDDED # define ENV_IS_EMBEDDED 1 # endif #endif /* CFG_ENV_IS_IN_NAND */ |