mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-03 16:04:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "eth: Moved eth_initialize to end of autoboot"

Browse source
This commit is contained in:
Linux Build Service Account 2017-12-28 04:32:22 -08:00 • committed by Gerrit - the friendly Code Review server
commit de84bbb6b5
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/autoboot.c
View file

@ -270,12 +270,6 @@ static int abortboot_normal(int bootdelay)
#ifdef CONFIG_SILENT_CONSOLE
if (abort)
gd->flags &= ~GD_FLG_SILENT;
#endif
#ifdef CONFIG_IPQ_ETH_INIT_DEFER
if (abort) {
puts("\nNet: ");
eth_initialize();
}
#endif
return abort;
}
@ -382,4 +376,9 @@ void autoboot_command(const char *s)
run_command_list(s, -1, 0);
}
#endif /* CONFIG_MENUKEY */
#ifdef CONFIG_IPQ_ETH_INIT_DEFER
puts("\nNet: ");
eth_initialize();
#endif
}