From: Frederic Leroy <fredo@starox.org>
Date: Tue, 10 Sep 2013 10:02:31 +0000 (+0200)
Subject: Fix loading freeze when netconsole is active
X-Git-Tag: v2013.10-rc4~40
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8094972d594d883e3e556751f67ff5cdd8a286c5;p=u-boot

Fix loading freeze when netconsole is active

Netconsole calls eth_halt() before giving control to another operating
system.
But the state machine of netconsole don't take it into account.
Thus, netconsole calls network functions of an halted network device,
making the whole system freeze.
Rather than modifying the state machine of netconsole, we just unregister
the current network device before booting. It does work because
nc_send_packet() verifies that the current network device is not null.

Signed-off-by: Frédéric Leroy <fredo@starox.org>
---

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 16d08f3524..349f1658bd 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -558,6 +558,7 @@ static ulong bootm_disable_interrupts(void)
 #ifdef CONFIG_NETCONSOLE
 	/* Stop the ethernet stack if NetConsole could have left it up */
 	eth_halt();
+	eth_unregister(eth_get_dev());
 #endif
 
 #if defined(CONFIG_CMD_USB)