jcs.org / u-boot
"Das U-Boot" Source Tree
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

expo: Use a simpler name for USB media

For USB devices we use the string 'usb_mass_storage' which is a bit
verbose. Use 'USB' instead.

Signed-off-by: Simon Glass <sjg@chromium.org>

Simon Glass 3c35fb03 e005f18b

+10 -1
+10 -1
boot/bootflow_menu.c
··· 84 84 { 85 85 struct menu_priv *priv = exp->priv; 86 86 char str[2], *label, *key; 87 + struct udevice *media; 87 88 struct scene *scn; 89 + const char *name; 88 90 uint preview_id; 89 91 uint scene_id; 90 92 bool add_gap; ··· 101 103 key = strdup(str); 102 104 if (!key) 103 105 return log_msg_ret("key", -ENOMEM); 104 - label = strdup(dev_get_parent(bflow->dev)->name); 106 + 107 + media = dev_get_parent(bflow->dev); 108 + if (device_get_uclass_id(media) == UCLASS_MASS_STORAGE) 109 + name = "usb"; 110 + else 111 + name = media->name; 112 + label = strdup(name); 113 + 105 114 if (!label) { 106 115 free(key); 107 116 return log_msg_ret("nam", -ENOMEM);