summaryrefslogtreecommitdiff
path: root/include/environment.h
diff options
context:
space:
mode:
authorroy zang <tie-fei.zang@freescale.com>2006-12-04 23:57:35 +0800
committerZang Tiefei <roy@bus.ap.freescale.net>2006-12-04 23:57:35 +0800
commitd3bb5ec198edad4869ac5276a5899881b7bf5433 (patch)
tree409a70e937d5f826df7929d11cb08a7cd207f5cd /include/environment.h
parent41862d13a87ec58c21166b10fcb754c963bc46f2 (diff)
parent9d27b3a0685ff99fc477983f315c04d49f657a8a (diff)
downloadu-boot-imx-d3bb5ec198edad4869ac5276a5899881b7bf5433.zip
u-boot-imx-d3bb5ec198edad4869ac5276a5899881b7bf5433.tar.gz
u-boot-imx-d3bb5ec198edad4869ac5276a5899881b7bf5433.tar.bz2
Merge /home/roy/CVS/7448/Open_Source/u-boot.git.dev
Diffstat (limited to 'include/environment.h')
-rw-r--r--include/environment.h3
1 files changed, 1 insertions, 2 deletions
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 */