diff options
| author | Stefan Roese <sr@denx.de> | 2006-11-27 17:34:10 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2006-11-27 17:34:10 +0100 |
| commit | d1a72545296800b7e219f93104ad5836f0003d66 (patch) | |
| tree | 8cd0714208b64a1604ad9921de26c33dbf9e0b12 /include | |
| parent | 3b58d9459081ae33885335c645fc0b865584ae4e (diff) | |
| download | blackbird-obmc-uboot-d1a72545296800b7e219f93104ad5836f0003d66.tar.gz blackbird-obmc-uboot-d1a72545296800b7e219f93104ad5836f0003d66.zip | |
[PATCH] Select NAND embedded environment from board configuration
The current NAND Bootloader setup forces the environment
variables to be in line with the bootloader. This change
enables the configuration to be made in the board include
file instead so that it can be individually enabled.
Signed-off-by: Nick Spence <nick.spence@freescale.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include')
| -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 1a460cde06..00b92220c1 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 26b07120da..af605ab7a9 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 */ |
