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 3796f826f39736cfb2cb00f66fe21a0a22d8610e..543958bf17a794f4c161a945ee436a8e8db98b02 100644 (file)
--- a/ArmPlatformPkg/Bds/BootMenu.c
+++ b/ArmPlatformPkg/Bds/BootMenu.c
@@ -227,7 +227,7 @@ BootMenuSelectBootOption (
   UINTN                         Index;\r
 \r
   // Display the list of supported boot devices\r
-  BootOptionCount = 1;\r
+  BootOptionCount = 0;\r
   for (Entry = GetFirstNode (BootOptionsList);\r
        !IsNull (BootOptionsList,Entry);\r
        Entry = GetNextNode (BootOptionsList, Entry)\r
@@ -239,7 +239,7 @@ BootMenuSelectBootOption (
       continue;\r
     }\r
 \r
-    Print (L"[%d] %s\n", BootOptionCount, BdsLoadOption->Description);\r
+    Print (L"[%d] %s\n", (BootOptionCount + 1), BdsLoadOption->Description);\r
 \r
     DEBUG_CODE_BEGIN();\r
       CHAR16*                           DevicePathTxt;\r
@@ -264,8 +264,16 @@ BootMenuSelectBootOption (
     BootOptionCount++;\r
   }\r
 \r
+  // Check if a valid boot option(s) is found\r
   if (BootOptionCount == 0) {\r
-    Print (L"No supported Boot Entry.\n");\r
+    if (StrCmp (InputStatement, DELETE_BOOT_ENTRY) == 0) {\r
+      Print (L"Nothing to remove!\n");\r
+    }else if (StrCmp (InputStatement, UPDATE_BOOT_ENTRY) == 0) {\r
+      Print (L"Couldn't find valid boot entries\n");\r
+    } else{\r
+      Print (L"No supported Boot Entry.\n");\r
+    }\r
+\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -276,8 +284,8 @@ BootMenuSelectBootOption (
     Status = GetHIInputInteger (&BootOptionSelected);\r
     if (EFI_ERROR(Status)) {\r
       return Status;\r
-    } else if ((BootOptionSelected == 0) || (BootOptionSelected >= BootOptionCount)) {\r
-      Print(L"Invalid input (max %d)\n",BootOptionCount-1);\r
+    } else if ((BootOptionSelected == 0) || (BootOptionSelected > BootOptionCount)) {\r
+      Print(L"Invalid input (max %d)\n",BootOptionCount);\r
       BootOptionSelected = 0;\r
     }\r
   }\r
@@ -307,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
@@ -344,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
@@ -468,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
@@ -611,6 +618,5 @@ BootMenuMain (
       Status = BootOptionStart (BootOption);\r
     }\r
   }\r
-\r
-  return Status;\r
+  // Should never go here\r
 }\r