| Message ID | 1457702584-21930-1-git-send-email-vitalya@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Fri, Mar 11, 2016 at 08:23:04AM -0500, Vitaly Andrianov wrote: > After power cycle of a K2G EVM dhcp fails due to a auto-negotiation > timeout. This commit increases the timeout to fix the issue. > > Signed-off-by: Vitaly Andrianov <vitalya@ti.com> > --- > > board/ti/ks2_evm/board.c | 2 +- > include/configs/k2g_evm.h | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c > index 73f0f27..a2c7542 100644 > --- a/board/ti/ks2_evm/board.c > +++ b/board/ti/ks2_evm/board.c > @@ -7,8 +7,8 @@ > * SPDX-License-Identifier: GPL-2.0+ > */ > > -#include "board.h" > #include <common.h> > +#include "board.h" > #include <spl.h> > #include <exports.h> > #include <fdt_support.h> Spurious change? Reviewed-by: Tom Rini <trini@konsulko.com> for the rest tho.
On 03/11/2016 12:14 PM, Tom Rini wrote: > On Fri, Mar 11, 2016 at 08:23:04AM -0500, Vitaly Andrianov wrote: > >> After power cycle of a K2G EVM dhcp fails due to a auto-negotiation >> timeout. This commit increases the timeout to fix the issue. >> >> Signed-off-by: Vitaly Andrianov <vitalya@ti.com> >> --- >> >> board/ti/ks2_evm/board.c | 2 +- >> include/configs/k2g_evm.h | 1 + >> 2 files changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c >> index 73f0f27..a2c7542 100644 >> --- a/board/ti/ks2_evm/board.c >> +++ b/board/ti/ks2_evm/board.c >> @@ -7,8 +7,8 @@ >> * SPDX-License-Identifier: GPL-2.0+ >> */ >> >> -#include "board.h" >> #include <common.h> >> +#include "board.h" >> #include <spl.h> >> #include <exports.h> >> #include <fdt_support.h> > > Spurious change? > > Reviewed-by: Tom Rini <trini@konsulko.com> > > for the rest tho. > Without this change it gives compilation warning: In file included from include/config.h:5:0, from include/common.h:18, from board/ti/ks2_evm/board.c:11: include/configs/k2g_evm.h:55:0: warning: "PHY_ANEG_TIMEOUT" redefined #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ ^ In file included from ./arch/arm/include/asm/ti-common/keystone_net.h:14:0, from board/ti/ks2_evm/board.h:13, from board/ti/ks2_evm/board.c:10: include/phy.h:36:0: note: this is the location of the previous definition #define PHY_ANEG_TIMEOUT 4000
On Mon, Mar 14, 2016 at 08:19:56AM -0400, Vitaly Andrianov wrote: > On 03/11/2016 12:14 PM, Tom Rini wrote: > >On Fri, Mar 11, 2016 at 08:23:04AM -0500, Vitaly Andrianov wrote: > > > >>After power cycle of a K2G EVM dhcp fails due to a auto-negotiation > >>timeout. This commit increases the timeout to fix the issue. > >> > >>Signed-off-by: Vitaly Andrianov <vitalya@ti.com> > >>--- > >> > >> board/ti/ks2_evm/board.c | 2 +- > >> include/configs/k2g_evm.h | 1 + > >> 2 files changed, 2 insertions(+), 1 deletion(-) > >> > >>diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c > >>index 73f0f27..a2c7542 100644 > >>--- a/board/ti/ks2_evm/board.c > >>+++ b/board/ti/ks2_evm/board.c > >>@@ -7,8 +7,8 @@ > >> * SPDX-License-Identifier: GPL-2.0+ > >> */ > >> > >>-#include "board.h" > >> #include <common.h> > >>+#include "board.h" > >> #include <spl.h> > >> #include <exports.h> > >> #include <fdt_support.h> > > > >Spurious change? > > > >Reviewed-by: Tom Rini <trini@konsulko.com> > > > >for the rest tho. > > > Without this change it gives compilation warning: > > In file included from include/config.h:5:0, > from include/common.h:18, > from board/ti/ks2_evm/board.c:11: > include/configs/k2g_evm.h:55:0: warning: "PHY_ANEG_TIMEOUT" redefined > #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ > ^ > In file included from ./arch/arm/include/asm/ti-common/keystone_net.h:14:0, > from board/ti/ks2_evm/board.h:13, > from board/ti/ks2_evm/board.c:10: > include/phy.h:36:0: note: this is the location of the previous definition > #define PHY_ANEG_TIMEOUT 4000 Ah, OK, thanks for explaining then.
On Fri, Mar 11, 2016 at 08:23:04AM -0500, Vitaly Andrianov wrote: > After power cycle of a K2G EVM dhcp fails due to a auto-negotiation > timeout. This commit increases the timeout to fix the issue. > > Signed-off-by: Vitaly Andrianov <vitalya@ti.com> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c index 73f0f27..a2c7542 100644 --- a/board/ti/ks2_evm/board.c +++ b/board/ti/ks2_evm/board.c @@ -7,8 +7,8 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#include "board.h" #include <common.h> +#include "board.h" #include <spl.h> #include <exports.h> #include <fdt_support.h> diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index d67d091..805f75e 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -52,6 +52,7 @@ #define CONFIG_KSNET_NETCP_V1_5 #define CONFIG_KSNET_CPSW_NUM_PORTS 2 #define CONFIG_PHY_MICREL +#define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ /* MMC/SD */ #define CONFIG_MMC
After power cycle of a K2G EVM dhcp fails due to a auto-negotiation timeout. This commit increases the timeout to fix the issue. Signed-off-by: Vitaly Andrianov <vitalya@ti.com> --- board/ti/ks2_evm/board.c | 2 +- include/configs/k2g_evm.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)