commit e4ea7969521563b6478332c6e055b4c61a946eca
author Jon Loeliger <jdl@jdl.com> Mon Jun 11 19:02:05 2007 -0500
committer Wolfgang Denk <wd@denx.de> Wed Jul 04 00:23:10 2007 +0200
tree bb4a98072997b0c45516e8543b603835334c506d
parent 3de8b240530ba1ed8cf735a977ab3973b98813db

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>

common/env_flash.c

diff --git a/common/env_flash.c b/common/env_flash.c
index 1674b30..f9cf35a 100644
--- a/common/env_flash.c
+++ b/common/env_flash.c
@@ -37,7 +37,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if ((CONFIG_COMMANDS&(CFG_CMD_ENV|CFG_CMD_FLASH)) == (CFG_CMD_ENV|CFG_CMD_FLASH))
+#if ((CONFIG_COMMANDS&(CFG_CMD_ENV|CFG_CMD_FLASH)) == (CFG_CMD_ENV|CFG_CMD_FLASH)) || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH))
 #define CMD_SAVEENV
 #elif defined(CFG_ENV_ADDR_REDUND)
 #error Cannot use CFG_ENV_ADDR_REDUND without CFG_CMD_ENV & CFG_CMD_FLASH