From patchwork Wed Feb 12 10:37:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frieder Schrempf X-Patchwork-Id: 236222 List-Id: U-Boot discussion From: frieder.schrempf at kontron.de (Schrempf Frieder) Date: Wed, 12 Feb 2020 10:37:11 +0000 Subject: [PATCH v4 2/2] pxe: Get default selection from board type if label matches In-Reply-To: <20200212103629.12746-1-frieder.schrempf@kontron.de> References: <20200212103629.12746-1-frieder.schrempf@kontron.de> Message-ID: <20200212103629.12746-2-frieder.schrempf@kontron.de> From: Frieder Schrempf In order to auto-select an option from the pxe boot menu, that matches the detected board, we check the board model string in the devicetree and set the default menu selection, if it matches the label of the menu entry and there is no default selection already set. This is useful in combination with SPL that loads a FIT image with U-Boot and multiple DTBs. SPL can detect the board and choose the matching configuration in the FIT by using board_fit_config_name_match(). Signed-off-by: Frieder Schrempf Reviewed-by: Simon Glass --- Changes in v4: * Remove #ifdef that would cause build failures in case of OF_CONTROL being disabled. Changes in v3: * Get rid of #ifdef by using IS_ENABLED() in else branch. Changes in v2: * Don't use internal structs of menu, but instead call --- cmd/pxe_utils.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c index 53af04d7dc..9a6c67c93a 100644 --- a/cmd/pxe_utils.c +++ b/cmd/pxe_utils.c @@ -1220,6 +1220,44 @@ struct pxe_menu *parse_pxefile(cmd_tbl_t *cmdtp, unsigned long menucfg) return cfg; } +int pxe_match_menu_label_with_str(void *data, void *str) +{ + struct pxe_label *label; + + if (!data || !str) + return 0; + + label = (struct pxe_label *)data; + + if (strcmp(label->name, str) == 0) + return 1; + + return 0; +} + +int pxe_runtime_select_menu_default(struct menu *m) +{ + DECLARE_GLOBAL_DATA_PTR; + const char *model; + char *key; + int ret; + + model = fdt_getprop(gd->fdt_blob, 0, "model", NULL); + + if (!model) + return 0; + + ret = menu_set_default_by_item_data_match(m, + pxe_match_menu_label_with_str, (void *)model, &key); + if (ret) + return ret; + + printf("Menu entry %s fits detected board. " \ + "Use as default selection...\n", key); + + return 0; +} + /* * Converts a pxe_menu struct into a menu struct for use with U-Boot's generic * menu code. @@ -1258,6 +1296,8 @@ static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg) /* * After we've created items for each label in the menu, set the * menu's default label if one was specified. + * If OF_CONTROL is enabled and we don't have a default specified, + * we try to use an entry that matches the board/model name as default. */ if (default_num) { err = menu_default_set(m, default_num); @@ -1269,6 +1309,10 @@ static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg) printf("Missing default: %s\n", cfg->default_label); } + } else if (IS_ENABLED(CONFIG_OF_CONTROL) && + pxe_runtime_select_menu_default(m)) { + menu_destroy(m); + return NULL; } return m;