diff options
| author | Thirupathaiah Annapureddy <thiruan@linux.microsoft.com> | 2020-03-18 11:38:42 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-07 09:01:42 -0400 |
| commit | 5168d7a6264be30f82c1c074e43c24fcacbb4283 (patch) | |
| tree | b89bafeea8ed15b1403edf892964adaa5003255d /cmd/pxe_utils.c | |
| parent | fdf0819afb5b7a8757ba1b4fdfe14f3767ab7e87 (diff) | |
| download | u-boot-5168d7a6264be30f82c1c074e43c24fcacbb4283.zip u-boot-5168d7a6264be30f82c1c074e43c24fcacbb4283.tar.gz u-boot-5168d7a6264be30f82c1c074e43c24fcacbb4283.tar.bz2 | |
menu: add support for client defined statusline function
Currently displaying status line is done in a weak function
menu_display_statusline().
bootmenu.c overrides the weak default function.
It calls menu_default_choice() and interprets the data as
struct bootmenu_entry.
pxe boot also uses common menu code for pxe menus.
If there is a system that enables both bootmenu and pxe,
menu_display_statusline() defined in bootmenu.c will be called
and it will interpret struct pxe_label as struct bootmenu_entry.
This leads to data aborts and pxe menu corruptions.
This patch adds support for client defined statusline function
to resolve the above bug.
Signed-off-by: Thirupathaiah Annapureddy <thiruan@linux.microsoft.com>
Diffstat (limited to 'cmd/pxe_utils.c')
| -rw-r--r-- | cmd/pxe_utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c index 53af04d..c244bfb 100644 --- a/cmd/pxe_utils.c +++ b/cmd/pxe_utils.c @@ -1237,7 +1237,7 @@ static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg) * Create a menu and add items for all the labels. */ m = menu_create(cfg->title, DIV_ROUND_UP(cfg->timeout, 10), - cfg->prompt, label_print, NULL, NULL); + cfg->prompt, NULL, label_print, NULL, NULL); if (!m) return NULL; |