diff options
| author | Ye Li <ye.li@nxp.com> | 2017-03-06 22:37:17 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-04-05 14:06:23 +0800 |
| commit | 76e1c802c089ca8da340e2b4aabe9f1f9a80969f (patch) | |
| tree | 83a3dbf880f895f915424e9bc344a92fe017813b /board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | |
| parent | dbf1c4a4c9bdc3f4c37036ecd07496ea85b0646e (diff) | |
| download | u-boot-imx-76e1c802c089ca8da340e2b4aabe9f1f9a80969f.zip u-boot-imx-76e1c802c089ca8da340e2b4aabe9f1f9a80969f.tar.gz u-boot-imx-76e1c802c089ca8da340e2b4aabe9f1f9a80969f.tar.bz2 | |
MLK-14326-9 mx6sxsabreauto: Update board file and build configuration
Enable FEC, USB and QSPI DM driver in build configuration and update
board file for them.
Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'board/freescale/mx6sxsabreauto/mx6sxsabreauto.c')
| -rw-r--r-- | board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c index 962c333..311e457 100644 --- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c +++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c @@ -131,8 +131,6 @@ int board_eth_init(bd_t *bis) else imx_iomux_v3_setup_multiple_pads(fec2_pads, ARRAY_SIZE(fec2_pads)); - setup_fec(CONFIG_FEC_ENET_DEV); - ret = fecmxc_initialize_multi(bis, CONFIG_FEC_ENET_DEV, CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE); if (ret) @@ -391,6 +389,7 @@ size_t display_count = ARRAY_SIZE(displays); #ifdef CONFIG_FSL_QSPI +#ifndef CONFIG_DM_SPI #define QSPI_PAD_CTRL1 \ (PAD_CTL_SRE_FAST | PAD_CTL_SPEED_HIGH | \ PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_47K_UP | PAD_CTL_DSE_40ohm) @@ -409,13 +408,15 @@ static iomux_v3_cfg_t const quadspi_pads[] = { MX6_PAD_QSPI1B_DATA2__QSPI1_B_DATA_2 | MUX_PAD_CTRL(QSPI_PAD_CTRL1), MX6_PAD_QSPI1B_DATA3__QSPI1_B_DATA_3 | MUX_PAD_CTRL(QSPI_PAD_CTRL1), }; +#endif int board_qspi_init(void) { +#ifndef CONFIG_DM_SPI /* Set the iomux */ imx_iomux_v3_setup_multiple_pads(quadspi_pads, ARRAY_SIZE(quadspi_pads)); - +#endif /* Set the clock */ enable_qspi_clk(0); @@ -503,6 +504,11 @@ int board_init(void) setup_gpmi_nand(); #endif + /* Also used for OF_CONTROL enabled */ +#ifdef CONFIG_FEC_MXC + setup_fec(CONFIG_FEC_ENET_DEV); +#endif + return 0; } |