On 02/10/2017 21:32, Anatolij Gustschin wrote: > UART pinmux has been changed on the last board revision. Change > board pinmux accordingly. Console is on UART7 now, add pinmux, > base address and update console string in environment. > > Signed-off-by: Anatolij Gustschin <[email protected]> > --- > board/ccv/xpress/xpress.c | 14 ++++++++++---- > include/configs/xpress.h | 4 ++-- > 2 files changed, 12 insertions(+), 6 deletions(-) > > diff --git a/board/ccv/xpress/xpress.c b/board/ccv/xpress/xpress.c > index b65646588a..8de2c4e6c2 100644 > --- a/board/ccv/xpress/xpress.c > +++ b/board/ccv/xpress/xpress.c > @@ -108,6 +108,8 @@ int dram_init(void) > static iomux_v3_cfg_t const uart1_pads[] = { > MX6_PAD_UART1_TX_DATA__UART1_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), > MX6_PAD_UART1_RX_DATA__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), > + MX6_PAD_UART1_CTS_B__UART1_DCE_CTS | MUX_PAD_CTRL(UART_PAD_CTRL), > + MX6_PAD_UART1_RTS_B__UART1_DCE_RTS | MUX_PAD_CTRL(UART_PAD_CTRL), > }; > > static iomux_v3_cfg_t const uart4_pads[] = { > @@ -122,11 +124,14 @@ static iomux_v3_cfg_t const uart5_pads[] = { > MX6_PAD_GPIO1_IO08__UART5_DCE_RTS | MUX_PAD_CTRL(UART_PAD_CTRL), > }; > > +static iomux_v3_cfg_t const uart7_pads[] = { > + MX6_PAD_ENET2_RX_EN__UART7_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), > + MX6_PAD_ENET2_TX_DATA0__UART7_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), > +}; > + > static iomux_v3_cfg_t const uart8_pads[] = { > - MX6_PAD_ENET2_TX_DATA1__UART8_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), > - MX6_PAD_ENET2_TX_EN__UART8_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), > - MX6_PAD_ENET2_TX_CLK__UART8_DCE_CTS | MUX_PAD_CTRL(UART_PAD_CTRL), > - MX6_PAD_ENET2_RX_ER__UART8_DCE_RTS | MUX_PAD_CTRL(UART_PAD_CTRL), > + MX6_PAD_LCD_DATA20__UART8_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), > + MX6_PAD_LCD_DATA21__UART8_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), > }; > > static void setup_iomux_uart(void) > @@ -134,6 +139,7 @@ static void setup_iomux_uart(void) > imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); > imx_iomux_v3_setup_multiple_pads(uart4_pads, ARRAY_SIZE(uart4_pads)); > imx_iomux_v3_setup_multiple_pads(uart5_pads, ARRAY_SIZE(uart5_pads)); > + imx_iomux_v3_setup_multiple_pads(uart7_pads, ARRAY_SIZE(uart7_pads)); > imx_iomux_v3_setup_multiple_pads(uart8_pads, ARRAY_SIZE(uart8_pads)); > } > > diff --git a/include/configs/xpress.h b/include/configs/xpress.h > index fdb504d9d9..c2575f01d9 100644 > --- a/include/configs/xpress.h > +++ b/include/configs/xpress.h > @@ -18,7 +18,7 @@ > #define CONFIG_SYS_MALLOC_LEN (16 << 20) > > #define CONFIG_MXC_UART > -#define CONFIG_MXC_UART_BASE UART1_BASE > +#define CONFIG_MXC_UART_BASE MX6UL_UART7_BASE_ADDR > > /* MMC Configs */ > #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR > @@ -87,7 +87,7 @@ > #define CONFIG_EXTRA_ENV_SETTINGS \ > "script=boot.scr\0" \ > "image=zImage\0" \ > - "console=ttymxc0\0" \ > + "console=ttymxc6\0" \ > "fdt_high=0xffffffff\0" \ > "initrd_high=0xffffffff\0" \ > "fdt_file=undefined\0" \ >
Reviewed-by: Stefano Babic <[email protected]> Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] ===================================================================== _______________________________________________ U-Boot mailing list [email protected] https://lists.denx.de/listinfo/u-boot
