diff options
| author | Stefano Babic <sbabic@denx.de> | 2012-11-10 08:05:54 +0100 | 
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2012-11-10 08:05:54 +0100 | 
| commit | 3e4d27b06d7484040355e22eec2cbce7335d6dab (patch) | |
| tree | 9672a2bb2e4ce0edc0ab776ddf0e2ca8e39a5f62 /arch/arm/cpu/armv7/socfpga/spl.c | |
| parent | bad05afe083eec0467220de21683443292c5012e (diff) | |
| parent | 59852d03867108217fe88e3bfc3e1e9cedfe63c5 (diff) | |
| download | olio-uboot-2014.01-3e4d27b06d7484040355e22eec2cbce7335d6dab.tar.xz olio-uboot-2014.01-3e4d27b06d7484040355e22eec2cbce7335d6dab.zip | |
Merge git://git.denx.de/u-boot
Diffstat (limited to 'arch/arm/cpu/armv7/socfpga/spl.c')
| -rw-r--r-- | arch/arm/cpu/armv7/socfpga/spl.c | 4 | 
1 files changed, 0 insertions, 4 deletions
| diff --git a/arch/arm/cpu/armv7/socfpga/spl.c b/arch/arm/cpu/armv7/socfpga/spl.c index 944238bad..84216eb1e 100644 --- a/arch/arm/cpu/armv7/socfpga/spl.c +++ b/arch/arm/cpu/armv7/socfpga/spl.c @@ -21,7 +21,6 @@  #include <asm/utils.h>  #include <version.h>  #include <image.h> -#include <malloc.h>  #include <asm/arch/reset_manager.h>  #include <spl.h> @@ -37,9 +36,6 @@ u32 spl_boot_device(void)   */  void spl_board_init(void)  { -	/* init timer for enabling delay function */ -	timer_init(); -  	/* de-assert reset for peripherals and bridges based on handoff */  	reset_deassert_peripherals_handoff(); |