Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 9f656fbee3b433ae1e9daf5d92d46bbdcc9551eb

Authored by Pedro Jardim
Committed by Stefano Babic
1 parent 905dbe23b9
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

mx6slevk: Convert to DM_ETH 

This fixes the following warning:

===================== WARNING ======================
This board does not use CONFIG_DM_ETH (Driver Model
for Ethernet drivers). Please update the board to use
CONFIG_DM_ETH before the v2020.07 release. Failure to
update by the deadline may result in board removal.
See doc/driver-model/migration.rst for more info.
====================================================

Signed-off-by: Pedro Jardim <jardim.c.pedro@gmail.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>

Showing 3 changed files with 3 additions and 38 deletions Side-by-side Diff

board/freescale/mx6slevk/mx6slevk.c
Diff comments   View file @ 9f656fb
... ... @@ -21,7 +21,6 @@
21 21 #include <fsl_esdhc_imx.h>
22 22 #include <i2c.h>
23 23 #include <mmc.h>
24   -#include <netdev.h>
25 24 #include <power/pmic.h>
26 25 #include <power/pfuze100_pmic.h>
27 26 #include "../common/pfuze.h"
28 27  
... ... @@ -102,35 +101,11 @@
102 101 };
103 102 #endif
104 103  
105   -static iomux_v3_cfg_t const fec_pads[] = {
106   - MX6_PAD_FEC_MDC__FEC_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL),
107   - MX6_PAD_FEC_MDIO__FEC_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL),
108   - MX6_PAD_FEC_CRS_DV__FEC_RX_DV | MUX_PAD_CTRL(ENET_PAD_CTRL),
109   - MX6_PAD_FEC_RXD0__FEC_RX_DATA0 | MUX_PAD_CTRL(ENET_PAD_CTRL),
110   - MX6_PAD_FEC_RXD1__FEC_RX_DATA1 | MUX_PAD_CTRL(ENET_PAD_CTRL),
111   - MX6_PAD_FEC_TX_EN__FEC_TX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL),
112   - MX6_PAD_FEC_TXD0__FEC_TX_DATA0 | MUX_PAD_CTRL(ENET_PAD_CTRL),
113   - MX6_PAD_FEC_TXD1__FEC_TX_DATA1 | MUX_PAD_CTRL(ENET_PAD_CTRL),
114   - MX6_PAD_FEC_REF_CLK__FEC_REF_OUT | MUX_PAD_CTRL(ENET_PAD_CTRL),
115   - MX6_PAD_FEC_RX_ER__GPIO_4_19 | MUX_PAD_CTRL(NO_PAD_CTRL),
116   - MX6_PAD_FEC_TX_CLK__GPIO_4_21 | MUX_PAD_CTRL(NO_PAD_CTRL),
117   -};
118   -
119 104 static void setup_iomux_uart(void)
120 105 {
121 106 imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
122 107 }
123 108  
124   -static void setup_iomux_fec(void)
125   -{
126   - imx_iomux_v3_setup_multiple_pads(fec_pads, ARRAY_SIZE(fec_pads));
127   -
128   - /* Power up LAN8720 PHY */
129   - gpio_request(ETH_PHY_POWER, "eth_pwr");
130   - gpio_direction_output(ETH_PHY_POWER , 1);
131   - udelay(15000);
132   -}
133   -
134 109 int board_mmc_get_env_dev(int devno)
135 110 {
136 111 return devno;
... ... @@ -179,12 +154,6 @@
179 154 #endif
180 155  
181 156 #ifdef CONFIG_FEC_MXC
182   -int board_eth_init(bd_t *bis)
183   -{
184   - setup_iomux_fec();
185   -
186   - return cpu_eth_init(bis);
187   -}
188 157  
189 158 static int setup_fec(void)
190 159 {
configs/mx6slevk_defconfig
Diff comments   View file @ 9f656fb
... ... @@ -61,4 +61,7 @@
61 61 CONFIG_USB_STORAGE=y
62 62 CONFIG_USB_HOST_ETHER=y
63 63 CONFIG_USB_ETHER_ASIX=y
  64 +CONFIG_DM_ETH=y
  65 +CONFIG_FEC_MXC=y
  66 +CONFIG_PHY_SMSC=y
include/configs/mx6slevk.h
Diff comments   View file @ 9f656fb
... ... @@ -32,13 +32,6 @@
32 32 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
33 33 #define CONFIG_SYS_I2C_SPEED 100000
34 34  
35   -#define CONFIG_FEC_MXC
36   -#define IMX_FEC_BASE ENET_BASE_ADDR
37   -#define CONFIG_FEC_XCV_TYPE RMII
38   -#define CONFIG_FEC_MXC_PHYADDR 0
39   -
40   -#define CONFIG_PHY_SMSC
41   -
42 35 #define CONFIG_EXTRA_ENV_SETTINGS \
43 36 "script=boot.scr\0" \
44 37 "image=zImage\0" \