summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-07-30 14:01:08 +0000
committerWolfgang Denk <wd@denx.de>2011-08-01 15:20:16 +0200
commit33a6b9e90bfd56ed389f37470534eede0773cdd7 (patch)
tree7dc88c76d02726d273e69596674d455012397837 /include
parente6a857da746d5d7d450e59c0f86664c6b279b1c2 (diff)
downloadu-boot-imx-33a6b9e90bfd56ed389f37470534eede0773cdd7.zip
u-boot-imx-33a6b9e90bfd56ed389f37470534eede0773cdd7.tar.gz
u-boot-imx-33a6b9e90bfd56ed389f37470534eede0773cdd7.tar.bz2
environment.h: fix warning: "CONFIG_ENV_IS_EMBEDDED" redefined
Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include')
-rw-r--r--include/environment.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/environment.h b/include/environment.h
index e8b6e45..6394a96 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -124,7 +124,9 @@ extern unsigned long nand_env_oob_offset;
/* The build system likes to know if the env is embedded */
#ifdef DO_DEPS_ONLY
# ifdef ENV_IS_EMBEDDED
-# define CONFIG_ENV_IS_EMBEDDED
+# ifndef CONFIG_ENV_IS_EMBEDDED
+# define CONFIG_ENV_IS_EMBEDDED
+# endif
# endif
#endif