diff options
| author | Simon Glass <sjg@chromium.org> | 2015-02-07 11:51:46 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-02-12 10:35:31 -0700 |
| commit | 0e7806d24a77179053c64ba481b3857805e061c8 (patch) | |
| tree | 59066e390f5cce0f53eae26a76453b9e595a6553 /arch/powerpc | |
| parent | 43301741fc3455704204df100bf73a4c2f15b697 (diff) | |
| download | talos-obmc-uboot-0e7806d24a77179053c64ba481b3857805e061c8.tar.gz talos-obmc-uboot-0e7806d24a77179053c64ba481b3857805e061c8.zip | |
ppc: amcc: Omit unneeded ns16550 CONFIG if using driver model
This comes from the device tree or a call to get_uart_clock().
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/include/asm/ppc460ex_gt.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/ppc460ex_gt.h b/arch/powerpc/include/asm/ppc460ex_gt.h index f41df0da6a..ea019aafdb 100644 --- a/arch/powerpc/include/asm/ppc460ex_gt.h +++ b/arch/powerpc/include/asm/ppc460ex_gt.h @@ -19,10 +19,12 @@ /* Memory mapped registers */ #define CONFIG_SYS_PERIPHERAL_BASE 0xef600000 /* Internal Peripherals */ +#ifndef CONFIG_DM_SERIAL #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_PERIPHERAL_BASE + 0x0300) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_PERIPHERAL_BASE + 0x0400) #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_PERIPHERAL_BASE + 0x0500) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_PERIPHERAL_BASE + 0x0600) +#endif #define GPIO0_BASE (CONFIG_SYS_PERIPHERAL_BASE + 0x0b00) #define GPIO1_BASE (CONFIG_SYS_PERIPHERAL_BASE + 0x0c00) |
