diff mbox

[U-Boot,trivial] env: remove value from boolean defines

Message ID 1324813377-16764-1-git-send-email-grinberg@compulab.co.il
State Accepted
Commit 6f403bad80224b9cfc5c97cb2ac1b608d1777d0d
Headers show

Commit Message

Igor Grinberg Dec. 25, 2011, 11:42 a.m. UTC
Several boolean defines have a value assigned.
Remove the value as defining the symbol is enough.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
---
 include/environment.h |    8 ++++----
 tools/envcrc.c        |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

Comments

Marek Vasut Dec. 25, 2011, 11:34 p.m. UTC | #1
> Several boolean defines have a value assigned.
> Remove the value as defining the symbol is enough.
> 
> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>

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

M

> ---
>  include/environment.h |    8 ++++----
>  tools/envcrc.c        |    6 +++---
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/include/environment.h b/include/environment.h
> index 3c145af..1ef44f3 100644
> --- a/include/environment.h
> +++ b/include/environment.h
> @@ -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 */
> diff --git a/tools/envcrc.c b/tools/envcrc.c
> index 51e3f54..08d2a8f 100644
> --- a/tools/envcrc.c
> +++ b/tools/envcrc.c
> @@ -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
Igor Grinberg Dec. 26, 2011, 6:17 a.m. UTC | #2
On 12/26/11 01:34, Marek Vasut wrote:
>> Several boolean defines have a value assigned.
>> Remove the value as defining the symbol is enough.
>>
>> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
> 
> 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).
Marek Vasut Dec. 26, 2011, 2:17 p.m. UTC | #3
> On 12/26/11 01:34, Marek Vasut wrote:
> >> Several boolean defines have a value assigned.
> >> Remove the value as defining the symbol is enough.
> >> 
> >> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
> > 
> > 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
Igor Grinberg Dec. 26, 2011, 3:05 p.m. UTC | #4
On 12/26/11 16:17, Marek Vasut wrote:
>> On 12/26/11 01:34, Marek Vasut wrote:
>>>> Several boolean defines have a value assigned.
>>>> Remove the value as defining the symbol is enough.
>>>>
>>>> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
>>>
>>> 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@gmail.com branch of u-boot-staging?
Or may be both...
Marek Vasut Dec. 26, 2011, 4:16 p.m. UTC | #5
> On 12/26/11 16:17, Marek Vasut wrote:
> >> On 12/26/11 01:34, Marek Vasut wrote:
> >>>> Several boolean defines have a value assigned.
> >>>> Remove the value as defining the symbol is enough.
> >>>> 
> >>>> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
> >>> 
> >>> 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@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 <marek.vasut@gmail.com>
Mike Frysinger Dec. 31, 2011, 11:05 p.m. UTC | #6
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
Wolfgang Denk Jan. 5, 2012, 3:36 p.m. UTC | #7
Dear Igor Grinberg,

In message <1324813377-16764-1-git-send-email-grinberg@compulab.co.il> you wrote:
> Several boolean defines have a value assigned.
> Remove the value as defining the symbol is enough.
> 
> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
> ---
>  include/environment.h |    8 ++++----
>  tools/envcrc.c        |    6 +++---
>  2 files changed, 7 insertions(+), 7 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/include/environment.h b/include/environment.h
index 3c145af..1ef44f3 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -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 */
diff --git a/tools/envcrc.c b/tools/envcrc.c
index 51e3f54..08d2a8f 100644
--- a/tools/envcrc.c
+++ b/tools/envcrc.c
@@ -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