diff options
| author | Tom Rini <trini@konsulko.com> | 2022-01-17 08:35:11 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-17 08:35:11 -0500 |
| commit | d928b365cc73426b0de883249700b3057b738cf3 (patch) | |
| tree | 576648536fb0b380fd23a39301fb6510cfff856d /boot | |
| parent | d71dbe657c3c22f50ecb3df133e5cdd884daae7d (diff) | |
| parent | 046bf8d4c512ad6501fe9e77508bbe1292a29fef (diff) | |
Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-net
- PXE label override support
- Fastboot UDP configurable port
- new phy driver: TI DP83869HM
- and few minor fixes to dsa.
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/pxe_utils.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index a32acca8ee..fcfee5e8b9 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -1355,9 +1355,11 @@ static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg) struct pxe_label *label; struct list_head *pos; struct menu *m; + char *label_override; int err; int i = 1; char *default_num = NULL; + char *override_num = NULL; /* * Create a menu and add items for all the labels. @@ -1367,6 +1369,8 @@ static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg) if (!m) return NULL; + label_override = env_get("pxe_label_override"); + list_for_each(pos, &cfg->labels) { label = list_entry(pos, struct pxe_label, list); @@ -1378,6 +1382,17 @@ static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg) if (cfg->default_label && (strcmp(label->name, cfg->default_label) == 0)) default_num = label->num; + if (label_override && !strcmp(label->name, label_override)) + override_num = label->num; + } + + + if (label_override) { + if (override_num) + default_num = override_num; + else + printf("Missing override pxe label: %s\n", + label_override); } /* |