Merge branch 'for-next/menu'

1 files changed, 7 insertions, 3 deletions

diff --git a/common/boot.c b/common/boot.c
index df9cba5b22..a971cb7a30 100644
--- a/common/boot.c
+++ b/common/boot.c
@@ -43,7 +43,7 @@ struct bootentries *bootentries_alloc(void)
 
 	if (IS_ENABLED(CONFIG_MENU)) {
 		bootentries->menu = menu_alloc();
-		bootentries->menu->display = basprintf("boot");
+		menu_add_title(bootentries->menu, basprintf("boot"));
 	}
 
 	return bootentries;
@@ -61,8 +61,12 @@ void bootentries_free(struct bootentries *bootentries)
 		be->release(be);
 	}
 
-	if (bootentries->menu)
+	if (bootentries->menu) {
+		int i;
+		for (i = 0; i < bootentries->menu->display_lines; i++)
+			free(bootentries->menu->display[i]);
 		free(bootentries->menu->display);
+	}
 	free(bootentries->menu);
 	free(bootentries);
 }
@@ -165,7 +169,6 @@ static void bootscript_entry_release(struct bootentry *entry)
 	struct bootentry_script *bs = container_of(entry, struct bootentry_script, entry);
 
 	free(bs->scriptpath);
-	free(bs->entry.me.display);
 	free(bs);
 }
 
@@ -320,6 +323,7 @@ void bootsources_menu(struct bootentries *bootentries, int timeout)
 
 	menu_show(bootentries->menu);
 
+	menu_remove_entry(bootentries->menu, back_entry);
 	free(back_entry);
 }