summaryrefslogtreecommitdiff
path: root/include/environment.h
diff options
context:
space:
mode:
authorTerry Lv <r65388@freescale.com>2009-11-10 22:29:11 +0800
committerTerry Lv <r65388@freescale.com>2009-11-11 11:55:18 +0800
commit20710100e480543d36b76845c52cdec382f2b43a (patch)
tree240703f02b2f29379dfae9ca97df234e5d1057ce /include/environment.h
parent34bc4951031059ccac23bf13fe261804f075880a (diff)
downloadu-boot-imx-20710100e480543d36b76845c52cdec382f2b43a.zip
u-boot-imx-20710100e480543d36b76845c52cdec382f2b43a.tar.gz
u-boot-imx-20710100e480543d36b76845c52cdec382f2b43a.tar.bz2
ENGR00118294: Misc changes for v2009.08 upgrade.
Misc changes for v2009.08 upgrade. Signed-off-by: Terry Lv <r65388@freescale.com>
Diffstat (limited to 'include/environment.h')
-rw-r--r--include/environment.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/environment.h b/include/environment.h
index 4d13437..e0759ae 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -97,17 +97,14 @@
#endif /* CONFIG_ENV_IS_IN_MG_DISK */
#if defined(CONFIG_ENV_IS_IN_MMC)
-#ifndef CONFIG_MMC_BASE
-# error "Need to define CONFIG_MMC_BASE when using CONFIG_ENV_IS_IN_MMC"
-#endif
# ifndef CONFIG_ENV_OFFSET
# error "Need to define CONFIG_ENV_OFFSET when using CONFIG_ENV_IS_IN_MMC"
# endif
# ifndef CONFIG_ENV_ADDR
-# define CONFIG_ENV_ADDR (CONFIG_MMC_BASE + CONFIG_ENV_OFFSET)
+# define CONFIG_ENV_ADDR (CONFIG_ENV_OFFSET)
# endif
# ifndef CONFIG_ENV_OFFSET
-# define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CONFIG_MMC_BASE)
+# define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR)
# endif
# ifdef CONFIG_ENV_OFFSET_REDUND
# define CONFIG_SYS_REDUNDAND_ENVIRONMENT