diff options
| author | Jon Loeliger <jdl@jdl.com> | 2007-06-11 19:02:05 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-04 00:23:10 +0200 |
| commit | b453960d4fdb87b3970d96119b90df2ed024fc4a (patch) | |
| tree | bb4a98072997b0c45516e8543b603835334c506d /common/env_nand.c | |
| parent | 65c450b47a62659d522cfa8f4fa1e4e5c60dccd0 (diff) | |
| download | u-boot-imx-b453960d4fdb87b3970d96119b90df2ed024fc4a.zip u-boot-imx-b453960d4fdb87b3970d96119b90df2ed024fc4a.tar.gz u-boot-imx-b453960d4fdb87b3970d96119b90df2ed024fc4a.tar.bz2 | |
common/ non-cmd: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).
This is a compatibility step that allows both the older form
and the new form to co-exist for a while until the older can
be removed entirely.
All transformations are of the form:
Before:
#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
After:
#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'common/env_nand.c')
| -rw-r--r-- | common/env_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/env_nand.c b/common/env_nand.c index 67c4a4e..f97af20 100644 --- a/common/env_nand.c +++ b/common/env_nand.c @@ -39,7 +39,7 @@ #include <malloc.h> #include <nand.h> -#if ((CONFIG_COMMANDS&(CFG_CMD_ENV|CFG_CMD_NAND)) == (CFG_CMD_ENV|CFG_CMD_NAND)) +#if ((CONFIG_COMMANDS&(CFG_CMD_ENV|CFG_CMD_NAND)) == (CFG_CMD_ENV|CFG_CMD_NAND)) || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) #define CMD_SAVEENV #elif defined(CFG_ENV_OFFSET_REDUND) #error Cannot use CFG_ENV_OFFSET_REDUND without CFG_CMD_ENV & CFG_CMD_NAND |