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.
This commit is contained in:
Tom Rini
2019-03-29 10:53:28 -04:00
5 changed files with 5 additions and 6 deletions

View File

@@ -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) {