projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e6a857d
)
environment.h: fix warning: "CONFIG_ENV_IS_EMBEDDED" redefined
author
Wolfgang Denk
<wd@denx.de>
Sat, 30 Jul 2011 14:01:08 +0000
(14:01 +0000)
committer
Wolfgang Denk
<wd@denx.de>
Mon, 1 Aug 2011 13:20:16 +0000
(15:20 +0200)
Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
include/environment.h
patch
|
blob
|
history
diff --git
a/include/environment.h
b/include/environment.h
index e8b6e45c3372b73f17d4d0bff7d43896d713b05c..6394a96c357d45c7112d75cc2edbbbd51e164a09 100644
(file)
--- 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