diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-03 16:23:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-03 16:23:03 -0500 |
| commit | cf7c6f533331ff032d8949663ab2abe618da9cb4 (patch) | |
| tree | 05b83585e594685f83f626c21071172be1d607e5 /common/board_r.c | |
| parent | 8f5bfb7615e82ffccebf79530b08034f81e56268 (diff) | |
| parent | fb0204e48b3e5ed5ecdfab89229140b6d4a1a08b (diff) | |
Merge branch '2018-12-03-master-imports'
- Baltos platform updates
- rtc m41t62 converted to DM.
- PowerPC MPC8xx DM conversion
- Verified boot updates
Diffstat (limited to 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/board_r.c b/common/board_r.c index c55e33eec27..0c2129b8ceb 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -743,7 +743,7 @@ static init_fnc_t init_sequence_r[] = { /* initialize higher level parts of CPU like time base and timers */ cpu_init_r, #endif -#ifdef CONFIG_PPC +#if defined(CONFIG_PPC) && !defined(CONFIG_DM_SPI) initr_spi, #endif #ifdef CONFIG_CMD_NAND |