diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-10 18:28:37 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-10 18:28:37 +0200 |
| commit | 1b83470f3c2eeae398cf90831f96c8ba4ed675fa (patch) | |
| tree | 39bcf8beb8722bfe9cacbb3310cd5571f1e0b720 /arch/arm/cpu/armv7/omap-common/hwinit-common.c | |
| parent | 74ae612fd8cfeb55f663bdd565d3f9d73703b2c4 (diff) | |
| parent | 68cd4a4c9f4d7be8dc95796fb567f6b03faf9d97 (diff) | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common/hwinit-common.c')
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/hwinit-common.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/hwinit-common.c b/arch/arm/cpu/armv7/omap-common/hwinit-common.c index 0776d5c6e8..5df116edbe 100644 --- a/arch/arm/cpu/armv7/omap-common/hwinit-common.c +++ b/arch/arm/cpu/armv7/omap-common/hwinit-common.c @@ -166,8 +166,6 @@ void s_init(void) #endif prcm_init(); #ifdef CONFIG_SPL_BUILD - timer_init(); - /* For regular u-boot sdram_init() is called from dram_init() */ sdram_init(); #endif |