leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bootcount: Correct #endif comment to match, other aesthetics

Browse Source 
Correct mismatched comment on #endif to agree with its #if defined().

Also add some missing #endif comments for consistency, take out
extraneous blank lines for readability.

rday
This commit is contained in:
Robert P. J. Day 2015-12-22 07:15:14 -05:00 committed by Tom Rini
parent 7207b366d5
commit 76765375d7
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/bootcount/bootcount.c
View File

@ -31,16 +31,14 @@
#if defined(CONFIG_MPC8260) #if defined(CONFIG_MPC8260)
#include <asm/cpm_8260.h> #include <asm/cpm_8260.h>
#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_IMMR + CPM_BOOTCOUNT_ADDR) #define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_IMMR + CPM_BOOTCOUNT_ADDR)
#endif /* defined(CONFIG_MPC8260) */ #endif /* defined(CONFIG_MPC8260) */
#if defined(CONFIG_QE) #if defined(CONFIG_QE)
#include <linux/immap_qe.h> #include <linux/immap_qe.h>
#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_IMMR + 0x110000 + \ #define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_IMMR + 0x110000 + \
QE_MURAM_SIZE - 2 * sizeof(u32)) QE_MURAM_SIZE - 2 * sizeof(u32))
#endif /* defined(CONFIG_MPC8360) */ #endif /* defined(CONFIG_QE) */
#if defined(CONFIG_4xx) #if defined(CONFIG_4xx)
#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_OCM_DATA_ADDR + \ #define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_OCM_DATA_ADDR + \
@ -60,7 +58,7 @@ __weak void bootcount_store(ulong a)
#else #else
raw_bootcount_store(reg, a); raw_bootcount_store(reg, a);
raw_bootcount_store(reg + 4, BOOTCOUNT_MAGIC); raw_bootcount_store(reg + 4, BOOTCOUNT_MAGIC);
#endif #endif /* defined(CONFIG_SYS_BOOTCOUNT_SINGLEWORD */
} }
__weak ulong bootcount_load(void) __weak ulong bootcount_load(void)
@ -79,6 +77,6 @@ __weak ulong bootcount_load(void)
return 0; return 0;
else else
return raw_bootcount_load(reg); return raw_bootcount_load(reg);
#endif #endif /* defined(CONFIG_SYS_BOOTCOUNT_SINGLEWORD) */
} }
#endif #endif /* defined(CONFIG_SYS_BOOTCOUNT_ADDR) */