Skip to content
Snippets Groups Projects
Commit 6f40f274 authored by Jason Hobbs's avatar Jason Hobbs Committed by Wolfgang Denk
Browse files

pxe: make the first label the implicit default


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: default avatarJason Hobbs <jason.hobbs@calxeda.com>
Cc: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
Cc: Wolfgang Denk <wd@denx.de>
parent d88af4da
No related branches found
No related tags found
No related merge requests found
...@@ -1273,10 +1273,21 @@ static void handle_pxe_menu(struct pxe_menu *cfg) ...@@ -1273,10 +1273,21 @@ static void handle_pxe_menu(struct pxe_menu *cfg)
menu_destroy(m); 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); boot_unattempted_labels(cfg);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment