diff options
| author | Tom Rini <trini@konsulko.com> | 2019-03-29 10:53:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-03-29 10:53:28 -0400 |
| commit | c3aef9339ce0592b06c8d44cf2eaf9e6f3713e4f (patch) | |
| tree | ee04147c6f17f12c95b1cd7a9a53a93c2c8513e2 /lib | |
| parent | b357ae5ed697da038d0ee6807f308f9177fcb3a7 (diff) | |
| parent | f00c26284ec0aa3e9b01ebe4996aa8fc01526d03 (diff) | |
Merge branch '2019-03-29-master-imports'
- Bugfixes:
- mmc: correct the HS400 initialization process
- configs: ti: Move FIT image load address to avoid overwrite
- lib: time: update module enable MACRO
- Add mbrugger as RPi board maintainer, correct agraf's email address.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/time.c b/lib/time.c index 3bf678a232..9c55da6f1b 100644 --- a/lib/time.c +++ b/lib/time.c @@ -56,7 +56,7 @@ ulong timer_get_boot_us(void) extern unsigned long __weak timer_read_counter(void); #endif -#ifdef CONFIG_TIMER +#if CONFIG_IS_ENABLED(TIMER) ulong notrace get_tbclk(void) { if (!gd->timer) { |