No functional changes, just more comments for readability when a preprocessor check spans more than a few lines, and for consistency.

Signed-off-by: Robert P. J. Day rpjday@crashcourse.ca

---

diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c index f3cd81a..89c587e 100644 --- a/arch/arm/cpu/armv7/omap3/board.c +++ b/arch/arm/cpu/armv7/omap3/board.c @@ -478,7 +478,7 @@ void omap3_outer_cache_disable(void) */ omap3_update_aux_cr(0, 0x2); } -#endif +#endif /* !CONFIG_SYS_L2CACHE_OFF */

#ifndef CONFIG_SYS_DCACHE_OFF void enable_caches(void) @@ -486,4 +486,4 @@ void enable_caches(void) /* Enable D-cache. I-cache is already enabled in start.S */ dcache_enable(); } -#endif +#endif /* !CONFIG_SYS_DCACHE_OFF */ diff --git a/arch/arm/cpu/armv7/omap3/mem.c b/arch/arm/cpu/armv7/omap3/mem.c index 2fe5ac7..e2894a8 100644 --- a/arch/arm/cpu/armv7/omap3/mem.c +++ b/arch/arm/cpu/armv7/omap3/mem.c @@ -47,9 +47,9 @@ static const u32 gpmc_m_nand[GPMC_MAX_REG] = { #define GPMC_CS 0 #else #define GPMC_CS 1 -#endif +#endif /* CONFIG_ENV_IS_IN_NAND */

-#endif +#endif /* CONFIG_CMD_NAND */

#if defined(CONFIG_CMD_ONENAND) static const u32 gpmc_onenand[GPMC_MAX_REG] = { @@ -65,9 +65,9 @@ static const u32 gpmc_onenand[GPMC_MAX_REG] = { #define GPMC_CS 0 #else #define GPMC_CS 1 -#endif +#endif /* CONFIG_ENV_IS_IN_ONENAND */

-#endif +#endif /* CONFIG_CMD_ONENAND */

/******************************************************** * mem_ok() - test used to see if timings are correct

rday