diff options
| author | Tom Rini <trini@ti.com> | 2015-02-13 13:11:09 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-13 13:11:09 -0500 |
| commit | 757566d1567a98f5c331c14f088001dbfe187191 (patch) | |
| tree | 86c9ab53fbefee672f37165f51db398338bf9968 /include/configs/amcc-common.h | |
| parent | c445506d73a0fba6472d12510b2d41148f078349 (diff) | |
| parent | b1f6659c420dae9cd06514fbd8342f39b3f326b9 (diff) | |
| download | u-boot-imx-757566d1567a98f5c331c14f088001dbfe187191.zip u-boot-imx-757566d1567a98f5c331c14f088001dbfe187191.tar.gz u-boot-imx-757566d1567a98f5c331c14f088001dbfe187191.tar.bz2 | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'include/configs/amcc-common.h')
| -rw-r--r-- | include/configs/amcc-common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index 2aea899..73e1b0a 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -20,8 +20,10 @@ */ #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL +#ifndef CONFIG_DM_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_serial_clock() +#endif #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} |