summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:48:00 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:48:00 +0200
commit93f6d72544da4510a146bc4c93d609b0116cde37 (patch)
tree5295b96f23662d7cf889a2c929fef8b2567710cc /common
parent2556ef78113b5f089dfcac5da90bf31dd568397b (diff)
downloadu-boot-imx-93f6d72544da4510a146bc4c93d609b0116cde37.zip
u-boot-imx-93f6d72544da4510a146bc4c93d609b0116cde37.tar.gz
u-boot-imx-93f6d72544da4510a146bc4c93d609b0116cde37.tar.bz2
rename CFG_ENV_IS_NOWHERE in CONFIG_ENV_IS_NOWHERE
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_nvedit.c6
-rw-r--r--common/env_common.c2
-rw-r--r--common/env_nowhere.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 85d7108..fc9b94e 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -59,7 +59,7 @@ DECLARE_GLOBAL_DATA_PTR;
!defined(CONFIG_ENV_IS_IN_NAND) && \
!defined(CONFIG_ENV_IS_IN_ONENAND) && \
!defined(CONFIG_ENV_IS_IN_SPI_FLASH) && \
- !defined(CFG_ENV_IS_NOWHERE)
+ !defined(CONFIG_ENV_IS_NOWHERE)
# error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
#endif
@@ -544,7 +544,7 @@ int getenv_r (char *name, char *buf, unsigned len)
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
- && !defined(CFG_ENV_IS_NOWHERE))
+ && !defined(CONFIG_ENV_IS_NOWHERE))
int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
extern char * env_name_spec;
@@ -600,7 +600,7 @@ U_BOOT_CMD(
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
- && !defined(CFG_ENV_IS_NOWHERE))
+ && !defined(CONFIG_ENV_IS_NOWHERE))
U_BOOT_CMD(
saveenv, 1, 0, do_saveenv,
"saveenv - save environment variables to persistent storage\n",
diff --git a/common/env_common.c b/common/env_common.c
index 36c46f0..c3946f0 100644
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -246,7 +246,7 @@ void env_relocate (void)
#endif
if (gd->env_valid == 0) {
-#if defined(CONFIG_GTH) || defined(CFG_ENV_IS_NOWHERE) /* Environment not changable */
+#if defined(CONFIG_GTH) || defined(CONFIG_ENV_IS_NOWHERE) /* Environment not changable */
puts ("Using default environment\n\n");
#else
puts ("*** Warning - bad CRC, using default environment\n\n");
diff --git a/common/env_nowhere.c b/common/env_nowhere.c
index 17ecc77..8dd4867 100644
--- a/common/env_nowhere.c
+++ b/common/env_nowhere.c
@@ -26,7 +26,7 @@
#include <common.h>
-#if defined(CFG_ENV_IS_NOWHERE) /* Environment is nowhere */
+#if defined(CONFIG_ENV_IS_NOWHERE) /* Environment is nowhere */
#include <command.h>
#include <environment.h>
@@ -62,4 +62,4 @@ int env_init(void)
return (0);
}
-#endif /* CFG_ENV_IS_NOWHERE) */
+#endif /* CONFIG_ENV_IS_NOWHERE) */