diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-12 07:55:17 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-12 07:55:17 -0400 |
| commit | 9885313b9add6c04cf3059958c5ee51a4f0ac930 (patch) | |
| tree | 521f4068c38677a996fe4d9b61d842426af6cfb4 /arch/arm/mach-socfpga/timer_s10.c | |
| parent | 47e9c70421d75336336097c1425028b40e4f0b54 (diff) | |
| parent | 505dc1c6795ba0b80abf344bb6464cdc20774f44 (diff) | |
Merge branch 'for-next' of https://github.com/lftan/u-boot
Diffstat (limited to 'arch/arm/mach-socfpga/timer_s10.c')
| -rw-r--r-- | arch/arm/mach-socfpga/timer_s10.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/timer_s10.c b/arch/arm/mach-socfpga/timer_s10.c index 3ad98bdb25..7d5598e1a3 100644 --- a/arch/arm/mach-socfpga/timer_s10.c +++ b/arch/arm/mach-socfpga/timer_s10.c @@ -14,6 +14,7 @@ */ int timer_init(void) { +#ifdef CONFIG_SPL_BUILD int enable = 0x3; /* timer enable + output signal masked */ int loadval = ~0; @@ -22,6 +23,6 @@ int timer_init(void) /* enable processor pysical counter */ asm volatile("msr cntp_ctl_el0, %0" : : "r" (enable)); asm volatile("msr cntp_tval_el0, %0" : : "r" (loadval)); - +#endif return 0; } |