From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernhard Nortmann Date: Mon, 14 Sep 2015 15:29:45 +0200 Subject: [U-Boot] [RESEND PATCH v3 3/5] net: avoid eth_unregister() call when function is unavailable In-Reply-To: <1442237387-29474-1-git-send-email-bernhard.nortmann@web.de> References: <1442237387-29474-1-git-send-email-bernhard.nortmann@web.de> Message-ID: <1442237387-29474-4-git-send-email-bernhard.nortmann@web.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de CONFIG_NETCONSOLE causes common/bootm.c to call eth_unregister() for network device shutdown. However, with CONFIG_DM_ETH this function is no longer defined. This is a workaround to avoid the call in that case, and solely rely on eth_halt(). In case this is insufficient, a proper way to unregister / remove network devices needs to be implemented. Signed-off-by: Bernhard Nortmann Reviewed-by: Simon Glass Acked-by: Joe Hershberger --- Changes in v3: None Changes in v2: - add "net:" prefix to commit message common/bootm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/bootm.c b/common/bootm.c index 667c934..c0d0d09 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -474,7 +474,9 @@ ulong bootm_disable_interrupts(void) #ifdef CONFIG_NETCONSOLE /* Stop the ethernet stack if NetConsole could have left it up */ eth_halt(); +# ifndef CONFIG_DM_ETH eth_unregister(eth_get_dev()); +# endif #endif #if defined(CONFIG_CMD_USB) -- 2.4.6