Message ID | alpine.DEB.2.02.1211131310440.6909@oneiric |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
On Tuesday 13 November 2012 11:42 PM, Robert P. J. Day wrote: > > No functional changes, simply for readability. > > Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> > > --- > > diff --git a/arch/arm/cpu/armv7/omap4/clocks.c b/arch/arm/cpu/armv7/omap4/clocks.c > index 5bd0a88..12c5803 100644 > --- a/arch/arm/cpu/armv7/omap4/clocks.c > +++ b/arch/arm/cpu/armv7/omap4/clocks.c > @@ -44,7 +44,7 @@ > */ > #define printf(fmt, args...) > #define puts(s) > -#endif > +#endif /* !CONFIG_SPL_BUILD */ > > struct omap4_prcm_regs *const prcm = (struct omap4_prcm_regs *)0x4A004100; > > diff --git a/arch/arm/cpu/armv7/omap4/hwinit.c b/arch/arm/cpu/armv7/omap4/hwinit.c > index 2c34e48..f4123aa 100644 > --- a/arch/arm/cpu/armv7/omap4/hwinit.c > +++ b/arch/arm/cpu/armv7/omap4/hwinit.c > @@ -116,7 +116,7 @@ void do_io_settings(void) > if ((omap4_rev < OMAP4460_ES1_0) || !readl(&ctrl->control_efuse_2)) > writel(CONTROL_EFUSE_2_OVERRIDE, &ctrl->control_efuse_2); > } > -#endif > +#endif /* CONFIG_SPL_BUILD */ > > /* dummy fuction for omap4 */ > void config_data_eye_leveling_samples(u32 emif_base) > @@ -182,4 +182,4 @@ void v7_outer_cache_disable(void) > { > set_pl310_ctrl_reg(0); > } > -#endif > +#endif /* !CONFIG_SYS_L2CACHE_OFF */ > > Thanks.. Regards, Sricharan
On Tue, Nov 13, 2012 at 08:12:08AM -0000, Robert P. J. Day wrote: > No functional changes, simply for readability. > > Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Applied to u-boot-ti/master, thanks!
diff --git a/arch/arm/cpu/armv7/omap4/clocks.c b/arch/arm/cpu/armv7/omap4/clocks.c index 5bd0a88..12c5803 100644 --- a/arch/arm/cpu/armv7/omap4/clocks.c +++ b/arch/arm/cpu/armv7/omap4/clocks.c @@ -44,7 +44,7 @@ */ #define printf(fmt, args...) #define puts(s) -#endif +#endif /* !CONFIG_SPL_BUILD */ struct omap4_prcm_regs *const prcm = (struct omap4_prcm_regs *)0x4A004100; diff --git a/arch/arm/cpu/armv7/omap4/hwinit.c b/arch/arm/cpu/armv7/omap4/hwinit.c index 2c34e48..f4123aa 100644 --- a/arch/arm/cpu/armv7/omap4/hwinit.c +++ b/arch/arm/cpu/armv7/omap4/hwinit.c @@ -116,7 +116,7 @@ void do_io_settings(void) if ((omap4_rev < OMAP4460_ES1_0) || !readl(&ctrl->control_efuse_2)) writel(CONTROL_EFUSE_2_OVERRIDE, &ctrl->control_efuse_2); } -#endif +#endif /* CONFIG_SPL_BUILD */ /* dummy fuction for omap4 */ void config_data_eye_leveling_samples(u32 emif_base) @@ -182,4 +182,4 @@ void v7_outer_cache_disable(void) { set_pl310_ctrl_reg(0); } -#endif +#endif /* !CONFIG_SYS_L2CACHE_OFF */
No functional changes, simply for readability. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> ---