mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-23 20:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

pxe: make the first label the implicit default

Browse Source 
If no default label is specified, but a situation arises where the
default label should be used, treat the first label specified as the
default label.

Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com>
Cc: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
Cc: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Jason Hobbs 2011-11-07 03:07:15 +00:00 committed by Wolfgang Denk
parent d88af4da9a
commit 6f40f2749a
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/cmd_pxe.c
View File

@ -1273,10 +1273,21 @@ static void handle_pxe_menu(struct pxe_menu *cfg)
menu_destroy(m);
if (err < 1)
return;
/*
* err == 1 means we got a choice back from menu_get_choice.
*
* err == -ENOENT if the menu was setup to select the default but no
* default was set. in that case, we should continue trying to boot
* labels that haven't been attempted yet.
*
* otherwise, the user interrupted or there was some other error and
* we give up.
*/
label_boot(choice);
if (err == 1)
label_boot(choice);
else if (err != -ENOENT)
return;
boot_unattempted_labels(cfg);
}