diff options
| author | Tom Rini <[email protected]> | 2023-04-16 18:59:40 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-04-16 18:59:40 -0400 |
| commit | e35da4994aa51112a1becfb127de6346f20475ab (patch) | |
| tree | 6b83a1abc27955ef9292142c92c7518b1f25c08c /common | |
| parent | 12c1e5782401abca1a8cff578d1911a9ca7d2e7d (diff) | |
| parent | ea82cd1cbdc9d2bf8ff94d2f993edce9fec16d1e (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/board_f.c b/common/board_f.c index f3c1ab53b1c..1688e27071f 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -863,7 +863,7 @@ static const init_fnc_t init_sequence_f[] = { /* get CPU and bus clocks according to the environment variable */ get_clocks, /* get CPU and bus clocks (etc.) */ #endif -#if !defined(CONFIG_M68K) +#if !defined(CONFIG_M68K) || (defined(CONFIG_M68K) && !defined(CONFIG_MCFTMR)) timer_init, /* initialize timer */ #endif #if defined(CONFIG_BOARD_POSTCLK_INIT) |