diff options
| author | Tom Rini <trini@konsulko.com> | 2018-08-24 16:11:12 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-08-24 16:11:12 -0400 |
| commit | a376702f761be51227bfc8d0ae06722ec40687d8 (patch) | |
| tree | c53eb4f6d480387f52b68f9688cb02a9919d1367 /include | |
| parent | 15fd1b7903a3090a03cfe453f661822a613a91ee (diff) | |
| parent | a029f540c54c39847c329fc70b1b2e0ab6dedbcd (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/socfpga_common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 440a918fc7c..2330143cf1c 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -86,11 +86,13 @@ /* * L4 OSC1 Timer 0 */ +#ifndef CONFIG_TIMER /* This timer uses eosc1, whose clock frequency is fixed at any condition. */ #define CONFIG_SYS_TIMERBASE SOCFPGA_OSC1TIMER0_ADDRESS #define CONFIG_SYS_TIMER_COUNTS_DOWN #define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMERBASE + 0x4) #define CONFIG_SYS_TIMER_RATE 25000000 +#endif /* * L4 Watchdog |