Skip to contentSkip to conversation

env: remove value from boolean defines

PATCH New Igor Grinberg 4 participants 8 messages Dec 25, 2011 – Jan 5, 2012

lore
Share & tools
lore

Igor Grinberg

author
#0 lore raw

PATCH 1/1 env: remove value from boolean defines

Several boolean defines have a value assigned. Remove the value as defining the symbol is enough.

Signed-off-by Igor Grinberg <[email protected]>
---
 include/environment.h |    8 ++++----
 tools/envcrc.c        |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
include/environment.h +4 -4
index 3c145af..1ef44f3 100644
@@ -22,7 +22,7 @@
  */
 
 #ifndef _ENVIRONMENT_H_
-#define _ENVIRONMENT_H_	1
+#define _ENVIRONMENT_H_
 
 /**************************************************************************
  *

@@ -64,10 +64,10 @@
 # if	(CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) &&		\
 	(CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <=			\
 	(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
-#  define ENV_IS_EMBEDDED	1
+#  define ENV_IS_EMBEDDED
 # endif
 # if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND)
-#  define CONFIG_SYS_REDUNDAND_ENVIRONMENT	1
+#  define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 # endif
 # ifdef CONFIG_ENV_IS_EMBEDDED
 #  error "do not define CONFIG_ENV_IS_EMBEDDED in your board config"

@@ -120,7 +120,7 @@ extern unsigned long nand_env_oob_offset;
  * calculated automatically (i.e. NAND), take the board opt-in.
  */
 #if defined(CONFIG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED)
-# define ENV_IS_EMBEDDED 1
+# define ENV_IS_EMBEDDED
 #endif
 
 /* The build system likes to know if the env is embedded */
tools/envcrc.c +3 -3
index 51e3f54..08d2a8f 100644
@@ -53,15 +53,15 @@
 # endif
 # if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \
      ((CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN))
-#  define ENV_IS_EMBEDDED	1
+#  define ENV_IS_EMBEDDED
 # endif
 # if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND)
-#  define CONFIG_SYS_REDUNDAND_ENVIRONMENT	1
+#  define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 # endif
 #endif	/* CONFIG_ENV_IS_IN_FLASH */
 
 #if defined(ENV_IS_EMBEDDED) && !defined(CONFIG_BUILD_ENVCRC)
-# define CONFIG_BUILD_ENVCRC 1
+# define CONFIG_BUILD_ENVCRC
 #endif
 
 #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
Signature · 1 line
1.7.3.4
#1 lore raw

PATCH 1/1 env: remove value from boolean defines

Quoted 4 lines

Several boolean defines have a value assigned. Remove the value as defining the symbol is enough.

Signed-off-by Igor Grinberg <[email protected]>

I'm fine with this. How did you find it ?

M

Quoted 63 lines
---
 include/environment.h |    8 ++++----
 tools/envcrc.c        |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
include/environment.h +4 -4
index 3c145af..1ef44f3 100644
@@ -22,7 +22,7 @@
  */
 
 #ifndef _ENVIRONMENT_H_
-#define _ENVIRONMENT_H_	1
+#define _ENVIRONMENT_H_
 
 /*************************************************************************
 * *

@@ -64,10 +64,10 @@
 # if	(CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) &&		\
 	(CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <=			\
 	(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
-#  define ENV_IS_EMBEDDED	1
+#  define ENV_IS_EMBEDDED
 # endif
 # if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND)
-#  define CONFIG_SYS_REDUNDAND_ENVIRONMENT	1
+#  define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 # endif
 # ifdef CONFIG_ENV_IS_EMBEDDED
 #  error "do not define CONFIG_ENV_IS_EMBEDDED in your board config"

@@ -120,7 +120,7 @@ extern unsigned long nand_env_oob_offset;
  * calculated automatically (i.e. NAND), take the board opt-in.
  */
 #if defined(CONFIG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED)
-# define ENV_IS_EMBEDDED 1
+# define ENV_IS_EMBEDDED
 #endif
 
 /* The build system likes to know if the env is embedded */
tools/envcrc.c +0 -0
index 51e3f54..08d2a8f 100644
@@ -53,15 +53,15 @@
 # endif
 # if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \
      ((CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= (CONFIG_SYS_MONITOR_BASE +

CONFIG_SYS_MONITOR_LEN)) -# define ENV_IS_EMBEDDED 1

tools/envcrc.c +3 -2
+#  define ENV_IS_EMBEDDED
 # endif
 # if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND)
-#  define CONFIG_SYS_REDUNDAND_ENVIRONMENT	1
+#  define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 # endif
 #endif	/* CONFIG_ENV_IS_IN_FLASH */
 
 #if defined(ENV_IS_EMBEDDED) && !defined(CONFIG_BUILD_ENVCRC)
-# define CONFIG_BUILD_ENVCRC 1
+# define CONFIG_BUILD_ENVCRC
 #endif
 
 #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
author
#2 lore raw

PATCH 1/1 env: remove value from boolean defines

Quoted 6 lines · Marek Vasut
Quoted 4 lines

Several boolean defines have a value assigned. Remove the value as defining the symbol is enough.

Signed-off-by Igor Grinberg <[email protected]>

I'm fine with this. How did you find it ?

Occasionally...
I told you (at the KS) I'm working on something environment related. I hope to post it soon (before the end of the merge window).

Signature · 2 lines
Regards,
Igor.
#3 lore raw

PATCH 1/1 env: remove value from boolean defines

Quoted 11 lines · Marek Vasut
Quoted 6 lines
Quoted 4 lines

Several boolean defines have a value assigned. Remove the value as defining the symbol is enough.

Signed-off-by Igor Grinberg <[email protected]>

I'm fine with this. How did you find it ?

Occasionally...
I told you (at the KS) I'm working on something environment related. I hope to post it soon (before the end of the merge window).

Ack

author
#4 lore raw

PATCH 1/1 env: remove value from boolean defines

Quoted 6 lines · Marek Vasut
Quoted 6 lines · Marek Vasut
Quoted 5 lines
Quoted 4 lines

Several boolean defines have a value assigned. Remove the value as defining the symbol is enough.

Signed-off-by Igor Grinberg <[email protected]>
Quoted 7 lines
Quoted 5 lines
Quoted 1 line

I'm fine with this. How did you find it ?

Occasionally...
I told you (at the KS) I'm working on something environment related. I hope to post it soon (before the end of the merge window).

Ack

Want to send a proper Ack, so patchwork will catch it?
Or may be apply to marek.vasut at gmail.com branch of u-boot-staging? Or may be both...

Signature · 2 lines
Regards,
Igor.
#5 lore raw

PATCH 1/1 env: remove value from boolean defines

Quoted 13 lines · Marek Vasut
Quoted 12 lines
Quoted 11 lines · Marek Vasut
Quoted 6 lines
Quoted 4 lines

Several boolean defines have a value assigned. Remove the value as defining the symbol is enough.

Signed-off-by Igor Grinberg <[email protected]>

I'm fine with this. How did you find it ?

Occasionally...
I told you (at the KS) I'm working on something environment related. I hope to post it soon (before the end of the merge window).

Quoted 5 lines
Quoted 1 line

Ack

Want to send a proper Ack, so patchwork will catch it?
Or may be apply to marek.vasut at gmail.com branch of u-boot-staging? Or may be both...

No, I only acked the explanation, I'd like others to comment on this patch before it's actually applied.

But grepping through the tree, I think it won't break anything, so

Acked-by Marek Vasut <[email protected]>
Applied
#7 lore raw

PATCH 1/1 env: remove value from boolean defines

In reply to Igor Grinberg

Dear Igor Grinberg,

Quoted 8 lines · In message <[email protected]> you…

Several boolean defines have a value assigned. Remove the value as defining the symbol is enough.

Signed-off-by Igor Grinberg <[email protected]>
---
 include/environment.h |    8 ++++----
 tools/envcrc.c        |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Common sense and a sense of humor  are  the  same  thing,  moving  at
different speeds.  A sense of humor is just common sense, dancing.
                                                        - Clive James