Commit
bdbcf4bee29b0659255675a982174091b59c75e6
Authored by
Ye Li
2020-05-15 13:15:14 +0800
MLK-23871 imx: Increase ENET PHY negotiation timeout for all iMX
Found the default negotiation timeout 4s is not enough in our test
environment. Increase it to 20s to avoid timeout.
Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked from commit e7252f1bd9f0034bc05bfab5c088d82ab2112062 )
Showing
13 changed files
with
16 additions
and
1 deletions
Side-by-side Diff
...
...
@@ -375,6 +375,7 @@
375
375 #define CONFIG_SYS_NONCACHED_MEMORY (1 * SZ_1M) /* 1M */
376
376 #endif
377
377 #define CONFIG_ETHPRIME "eth1"
378 +#define PHY_ANEG_TIMEOUT 20000
378
379
379
380 #endif /* __IMX8DXL_EVK_H */
...
...
@@ -325,6 +325,7 @@
325
325
326
326 #define CONFIG_FEC_XCV_TYPE RGMII
327
327 #define FEC_QUIRK_ENET_MAC
328 +#define PHY_ANEG_TIMEOUT 20000
328
329
329
330
330
331 #endif /* __IMX8DXL_PHANTOM_MEK_H */
...
...
@@ -60,6 +60,7 @@
60
60 /* ENET1 */
61
61 #if defined(CONFIG_FEC_MXC)
62
62 #define CONFIG_ETHPRIME "FEC"
63 +#define PHY_ANEG_TIMEOUT 20000
63
64
64
65 #define CONFIG_FEC_XCV_TYPE RGMII
65
66 #define CONFIG_FEC_MXC_PHYADDR 0
...
...
@@ -48,6 +48,7 @@
48
48 /* ENET1 */
49
49 #if defined(CONFIG_FEC_MXC)
50
50 #define CONFIG_ETHPRIME "FEC"
51 +#define PHY_ANEG_TIMEOUT 20000
51
52
52
53 #define FEC_QUIRK_ENET_MAC
53
54
...
...
@@ -66,6 +66,7 @@
66
66 /* ENET1 */
67
67 #if defined(CONFIG_FEC_MXC)
68
68 #define CONFIG_ETHPRIME "FEC"
69 +#define PHY_ANEG_TIMEOUT 20000
69
70
70
71 #define CONFIG_FEC_XCV_TYPE RGMII
71
72 #define CONFIG_FEC_MXC_PHYADDR 0
...
...
@@ -49,6 +49,7 @@
49
49 /* ENET1 */
50
50 #if defined(CONFIG_FEC_MXC)
51
51 #define CONFIG_ETHPRIME "FEC"
52 +#define PHY_ANEG_TIMEOUT 20000
52
53
53
54 #define CONFIG_FEC_XCV_TYPE RGMII
54
55 #define CONFIG_FEC_MXC_PHYADDR 0
...
...
@@ -62,6 +62,7 @@
62
62 /* ENET1 */
63
63 #if defined(CONFIG_FEC_MXC)
64
64 #define CONFIG_ETHPRIME "FEC"
65 +#define PHY_ANEG_TIMEOUT 20000
65
66
66
67 #define FEC_QUIRK_ENET_MAC
67
68
...
...
@@ -69,6 +69,7 @@
69
69
70
70 #define CONFIG_FEC_XCV_TYPE RGMII
71
71 #define FEC_QUIRK_ENET_MAC
72 +#define PHY_ANEG_TIMEOUT 20000
72
73
73
74 /* ENET0 connects AR8031 on CPU board, ENET1 connects to base board */
74
75 #define CONFIG_FEC_ENET_DEV 0
...
...
@@ -72,6 +72,7 @@
72
72
73
73 #define CONFIG_FEC_XCV_TYPE RGMII
74
74 #define FEC_QUIRK_ENET_MAC
75 +#define PHY_ANEG_TIMEOUT 20000
75
76
76
77 /* ENET0 connects AR8031 on CPU board, ENET1 connects to base board */
77
78 #define CONFIG_ETHPRIME "eth0"
...
...
@@ -334,6 +334,7 @@
334
334
335
335 #define CONFIG_FEC_XCV_TYPE RGMII
336
336 #define FEC_QUIRK_ENET_MAC
337 +#define PHY_ANEG_TIMEOUT 20000
337
338
338
339 #ifdef CONFIG_DM_VIDEO
339
340 #define CONFIG_VIDEO_LOGO
...
...
@@ -79,6 +79,7 @@
79
79
80
80 #define CONFIG_FEC_XCV_TYPE RGMII
81
81 #define FEC_QUIRK_ENET_MAC
82 +#define PHY_ANEG_TIMEOUT 20000
82
83
83
84 /* ENET0 connects AR8031 on CPU board, ENET1 connects to base board */
84
85 #define CONFIG_ETHPRIME "eth0"
...
...
@@ -57,6 +57,9 @@
57
57 #define CONFIG_SYS_MAXARGS 32
58
58 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
59
59
60 +/* NET PHY */
61 +#define PHY_ANEG_TIMEOUT 20000
62 +
60
63 /* MMC */
61
64 #define CONFIG_SUPPORT_EMMC_BOOT
62
65
...
...
@@ -40,7 +40,8 @@
40
40 /* UART */
41
41 #define CONFIG_MXC_UART
42
42
43
-/* MMC */
43 +/* NET PHY */
44 +#define PHY_ANEG_TIMEOUT 20000
44
45
45
46 #define CONFIG_ARMV7_SECURE_BASE 0x00900000
46
47
