ArmPlatformPkg/ArmVExpressPkg: Add support for ARM Versatile Express A9x4 Model

[mirror_edk2.git] / ArmPlatformPkg / Bds / BootMenu.c

diff --git a/ArmPlatformPkg/Bds/BootMenu.c b/ArmPlatformPkg/Bds/BootMenu.c
index 94be464f804dfa114e09a972b405fbbc538cf1a3..543958bf17a794f4c161a945ee436a8e8db98b02 100644 (file)
--- a/ArmPlatformPkg/Bds/BootMenu.c
+++ b/ArmPlatformPkg/Bds/BootMenu.c
@@ -315,7 +315,7 @@ BootMenuRemoveBootOption (
   EFI_STATUS                    Status;\r
   BDS_LOAD_OPTION_ENTRY*        BootOptionEntry;\r
 \r
-  Status = BootMenuSelectBootOption (BootOptionsList, L"Delete entry: ", FALSE, &BootOptionEntry);\r
+  Status = BootMenuSelectBootOption (BootOptionsList, DELETE_BOOT_ENTRY, FALSE, &BootOptionEntry);\r
   if (EFI_ERROR(Status)) {\r
     return Status;\r
   }\r
@@ -352,7 +352,7 @@ BootMenuUpdateBootOption (
   UINTN                         InitrdSize;\r
   UINTN                         CmdLineSize;\r
 \r
-  Status = BootMenuSelectBootOption (BootOptionsList, L"Update entry: ", TRUE, &BootOptionEntry);\r
+  Status = BootMenuSelectBootOption (BootOptionsList, UPDATE_BOOT_ENTRY, TRUE, &BootOptionEntry);\r
   if (EFI_ERROR(Status)) {\r
     return Status;\r
   }\r
@@ -476,8 +476,7 @@ BootMenuManager (
       BootManagerEntries[OptionSelected-1].Callback (BootOptionsList);\r
     }\r
   }\r
-\r
-  return EFI_SUCCESS;\r
+  // Should never go here\r
 }\r
 \r
 EFI_STATUS\r
@@ -619,6 +618,5 @@ BootMenuMain (
       Status = BootOptionStart (BootOption);\r
     }\r
   }\r
-\r
-  return Status;\r
+  // Should never go here\r
 }\r