Patchwork [U-Boot] environment.h: fix warning: "CONFIG_ENV_IS_EMBEDDED" redefined

login
register
mail settings
Submitter Wolfgang Denk
Date July 31, 2011, 12:01 a.m.
Message ID <1312070468-17261-1-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/107525/
State Accepted
Commit 33a6b9e90bfd56ed389f37470534eede0773cdd7
Headers show

Comments

Wolfgang Denk - July 31, 2011, 12:01 a.m.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
---
 include/environment.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
Wolfgang Denk - Aug. 1, 2011, 1:22 p.m.
Dear Wolfgang Denk,

In message <1312070468-17261-1-git-send-email-wd@denx.de> you wrote:
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Stefan Roese <sr@denx.de>
> ---
>  include/environment.h |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

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