diff options
| author | Tom Rini <trini@ti.com> | 2013-01-08 08:28:27 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-01-08 14:26:42 -0700 |
| commit | 91c038f087d7f643c85609897af3710d5f8b42a9 (patch) | |
| tree | e96b3c73031aafdd000a253e6dcf5ae6966e8c65 /arch/arm/cpu/armv7/omap4/hwinit.c | |
| parent | e56cdd778ca08fc8c32ffc3ddebbb6102519f344 (diff) | |
| parent | 7528cf5f016b5b8b8b12b373f6f31a10bf89233d (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/omap4/hwinit.c')
| -rw-r--r-- | arch/arm/cpu/armv7/omap4/hwinit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/omap4/hwinit.c b/arch/arm/cpu/armv7/omap4/hwinit.c index 2c34e48f42..f4123aaffc 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 */ |