From: Simon Glass <sjg@chromium.org>
Date: Sun, 21 Jul 2019 02:51:26 +0000 (-0600)
Subject: autoboot: Add comments for menu_show()
X-Git-Tag: v2019.10-rc2~21^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=14b9df1b487552b8e2f1274ac7ea8e3652694dcf;p=oweals%2Fu-boot.git

autoboot: Add comments for menu_show()

Add comments for this function. Also remove the #ifdef around it so that
it can be called from 'if (IS_ENABLED(...))'.

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

diff --git a/include/menu.h b/include/menu.h
index 8fd7b0a1f0..2d227c20bd 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -19,7 +19,20 @@ int menu_destroy(struct menu *m);
 void menu_display_statusline(struct menu *m);
 int menu_default_choice(struct menu *m, void **choice);
 
-#if defined(CONFIG_AUTOBOOT_MENU_SHOW)
+/**
+ * menu_show() Show a boot menu
+ *
+ * This shows a menu and lets the user select an option. The menu is defined by
+ * environment variables (see README.bootmenu).
+ *
+ * This function doesn't normally return, but if the users requests the command
+ * problem, it will.
+ *
+ * @bootdelay: Delay to wait before running the default menu option (0 to run
+ *		the entry immediately)
+ * @return If it returns, it always returns -1 to indicate that the boot should
+ *	be aborted and the command prompt should be provided
+ */
 int menu_show(int bootdelay);
-#endif
+
 #endif /* __MENU_H__ */