diff options
| author | Tom Rini <[email protected]> | 2019-03-13 16:07:41 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-03-13 16:07:41 -0400 |
| commit | a0d12cd2392af52000790739df3fc8ddbd4db460 (patch) | |
| tree | 75730552278c8ed9dde126cf4141d244ce29b991 /drivers/serial | |
| parent | 116a3a1ae085753e04b62c37a0f11f80cab9d730 (diff) | |
| parent | b882005a18dec45848e153dcf8d29b4a2feecf14 (diff) | |
Merge tag 'u-boot-imx-20190313' of git://git.denx.de/u-boot-imx
Small fixes in several i.MX boards
----------------------------------
- imx8: add pinctrl driveri (mx8m), fix documentation and
fix reported CPU frequency. Fabio is co-maintainer
- pico-imx6ul: switch to DM
- local fixes for ventana, mx6ul_14x14_evk, engicam,
imx6(q)_logic, liteboard
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_mxc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c index df35ac9114e..476df258059 100644 --- a/drivers/serial/serial_mxc.c +++ b/drivers/serial/serial_mxc.c @@ -178,7 +178,7 @@ static void _mxc_serial_setbrg(struct mxc_uart *base, unsigned long clk, writel(UCR1_UARTEN, &base->cr1); } -#ifndef CONFIG_DM_SERIAL +#if !CONFIG_IS_ENABLED(DM_SERIAL) #ifndef CONFIG_MXC_UART_BASE #error "define CONFIG_MXC_UART_BASE to use the MXC UART driver" @@ -260,7 +260,7 @@ __weak struct serial_device *default_serial_console(void) } #endif -#ifdef CONFIG_DM_SERIAL +#if CONFIG_IS_ENABLED(DM_SERIAL) int mxc_serial_setbrg(struct udevice *dev, int baudrate) { |