diff options
| author | Tom Rini <trini@konsulko.com> | 2018-09-18 20:42:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-09-18 20:42:37 -0400 |
| commit | 4e710ebb4463c8e031eb269c012fbadb2479608b (patch) | |
| tree | f334518436bc0262b483308026fbba413a45493e /arch/powerpc/include/asm/config.h | |
| parent | b57f1895b669e3fbdca486e7c40dfea00f22bb93 (diff) | |
| parent | 75629a25087cd9897305375421abe2248bc40e72 (diff) | |
Merge git://git.denx.de/u-boot-dm
- MPC83xx device tree additions (CPU and RAM)
- Fix sandbox build error
- Sync bitrev with Linux
- Various ofnode/DT improvements
Diffstat (limited to 'arch/powerpc/include/asm/config.h')
| -rw-r--r-- | arch/powerpc/include/asm/config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index bf11f40e231..849a69acedc 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -75,7 +75,7 @@ /* All PPC boards must swap IDE bytes */ #define CONFIG_IDE_SWAP_IO -#if defined(CONFIG_DM_SERIAL) +#if defined(CONFIG_DM_SERIAL) && !defined(CONFIG_CLK_MPC83XX) /* * TODO: Convert this to a clock driver exists that can give us the UART * clock here. |