Skip to contentSkip to conversation

Remove duplication of CONFIG_BOOTCOUNT_LIMIT

PATCH New Ashok Kumar Reddy 2 participants 2 messages Jan 13, 2013

lore
Share & tools
lore

Ashok Kumar Reddy

author
#0 lore raw

PATCH 1/1 Remove duplication of CONFIG_BOOTCOUNT_LIMIT

Remove duplication of CONFIG_BOOTCOUNT_LIMIT

Signed-off-by Ashok Kumar Reddy <[email protected]>
---
 common/main.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
common/main.c +3 -5
index 5d8454e..2314f27 100644
@@ -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);
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 Remove duplication of CONFIG_BOOTCOUNT_LIMIT

Dear Ashok Kumar Reddy,

Quoted 21 lines · In message <[email protected]> you wrote:

Remove duplication of CONFIG_BOOTCOUNT_LIMIT

Signed-off-by Ashok Kumar Reddy <[email protected]>
---
 common/main.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
common/main.c +3 -0
index 5d8454e..2314f27 100644
@@ -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;

common/main.c void main_loop (void) · line 382

Quoted 10 lines
common/main.c +0 -5
 	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

Signature · 4 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
What was sliced bread the greatest thing since?