Patchwork [U-Boot] Remove duplication of CONFIG_BOOTCOUNT_LIMIT

login
register
mail settings
Submitter Ashok
Date Jan. 13, 2013, 3:54 p.m.
Message ID <50F2D8D2.9010606@gmail.com>
Download mbox | patch
Permalink /patch/211638/
State Rejected
Delegated to: Wolfgang Denk
Headers show

Comments

Ashok - Jan. 13, 2013, 3:54 p.m.
Remove duplication of CONFIG_BOOTCOUNT_LIMIT

Signed-off-by: Ashok Kumar Reddy <ashokkourla2000@gmail.com>
---
 common/main.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
Wolfgang Denk - Jan. 13, 2013, 5:11 p.m.
Dear Ashok Kumar Reddy,

In message <50F2D8D2.9010606@gmail.com> you wrote:
> Remove duplication of CONFIG_BOOTCOUNT_LIMIT
> 
> Signed-off-by: Ashok Kumar Reddy <ashokkourla2000@gmail.com>
> ---
>  common/main.c |    8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/common/main.c b/common/main.c
> index 5d8454e..2314f27 100644
> --- a/common/main.c
> +++ b/common/main.c
> @@ -369,16 +369,14 @@ void main_loop (void)
>  #ifdef CONFIG_PREBOOT
>  	char *p;
>  #endif
> +
> +	bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop");
> +
>  #ifdef CONFIG_BOOTCOUNT_LIMIT
>  	unsigned long bootcount = 0;
>  	unsigned long bootlimit = 0;
>  	char *bcs;
>  	char bcs_set[16];
> -#endif /* CONFIG_BOOTCOUNT_LIMIT */
> -
> -	bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop");
> -
> -#ifdef CONFIG_BOOTCOUNT_LIMIT
>  	bootcount = bootcount_load();
>  	bootcount++;
>  	bootcount_store (bootcount);

NAK.  You must not move code right in the middle of the declarations.

Best regards,

Wolfgang Denk

Patch

diff --git a/common/main.c b/common/main.c
index 5d8454e..2314f27 100644
--- a/common/main.c
+++ b/common/main.c
@@ -369,16 +369,14 @@  void main_loop (void)
 #ifdef CONFIG_PREBOOT
 	char *p;
 #endif
+
+	bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop");
+
 #ifdef CONFIG_BOOTCOUNT_LIMIT
 	unsigned long bootcount = 0;
 	unsigned long bootlimit = 0;
 	char *bcs;
 	char bcs_set[16];
-#endif /* CONFIG_BOOTCOUNT_LIMIT */
-
-	bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop");
-
-#ifdef CONFIG_BOOTCOUNT_LIMIT
 	bootcount = bootcount_load();
 	bootcount++;
 	bootcount_store (bootcount);