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 ad2e91455457845e64e60cfa5cc52c55c7cc3b96..543958bf17a794f4c161a945ee436a8e8db98b02 100644 (file)
--- a/ArmPlatformPkg/Bds/BootMenu.c
+++ b/ArmPlatformPkg/Bds/BootMenu.c
@@ -53,9 +53,9 @@ SelectBootDevice (
       CHAR16*                           DevicePathTxt;\r
       EFI_DEVICE_PATH_TO_TEXT_PROTOCOL* DevicePathToTextProtocol;\r
 \r
-      Status = gBS->LocateProtocol(&gEfiDevicePathToTextProtocolGuid, NULL, (VOID **)&DevicePathToTextProtocol);\r
+      Status = gBS->LocateProtocol (&gEfiDevicePathToTextProtocolGuid, NULL, (VOID **)&DevicePathToTextProtocol);\r
       ASSERT_EFI_ERROR(Status);\r
-      DevicePathTxt = DevicePathToTextProtocol->ConvertDevicePathToText((*SupportedBootDevice)->DevicePathProtocol,TRUE,TRUE);\r
+      DevicePathTxt = DevicePathToTextProtocol->ConvertDevicePathToText ((*SupportedBootDevice)->DevicePathProtocol,TRUE,TRUE);\r
 \r
       Print(L"\t- %s\n",DevicePathTxt);\r
 \r
@@ -82,7 +82,7 @@ SelectBootDevice (
       Status = EFI_ABORTED;\r
       goto EXIT;\r
     } else if ((SupportedDeviceSelected == 0) || (SupportedDeviceSelected > SupportedDeviceCount)) {\r
-      Print(L"Invalid input (max %d)\n",SupportedDeviceSelected);\r
+      Print(L"Invalid input (max %d)\n",SupportedDeviceCount);\r
       SupportedDeviceSelected = 0;\r
     }\r
   }\r
@@ -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
@@ -285,7 +293,7 @@ BootMenuSelectBootOption (
   // Get the structure of the Boot device to delete\r
   Index = 1;\r
   for (Entry = GetFirstNode (BootOptionsList);\r
-       !IsNull (BootOptionsList,Entry);\r
+       !IsNull (BootOptionsList, Entry);\r
        Entry = GetNextNode (BootOptionsList,Entry)\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,16 +352,16 @@ 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
   BootOption = BootOptionEntry->BdsLoadOption;\r
 \r
   // Get the device support for this Boot Option\r
-  Status = BootDeviceGetDeviceSupport (BootOption,&DeviceSupport);\r
+  Status = BootDeviceGetDeviceSupport (BootOption, &DeviceSupport);\r
   if (EFI_ERROR(Status)) {\r
-    Print(L"Impossible to retrieve the supported device for the update\n");\r
+    Print(L"Not possible to retrieve the supported device for the update\n");\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -372,14 +380,16 @@ BootMenuUpdateBootOption (
     LinuxArguments = &OptionalData->Arguments.LinuxArguments;\r
 \r
     CmdLineSize = ReadUnaligned16 ((CONST UINT16*)&LinuxArguments->CmdLineSize);\r
-    InitrdSize = GetUnalignedDevicePathSize ((EFI_DEVICE_PATH*)((LinuxArguments + 1) + CmdLineSize));\r
 \r
-    Print(L"File path of the initrd: ");\r
-    Status = DeviceSupport->UpdateDevicePathNode (\r
-      (EFI_DEVICE_PATH_PROTOCOL *)((UINTN)(LinuxArguments + 1) + CmdLineSize), &InitrdPathList, NULL, NULL);\r
-    if (EFI_ERROR(Status) && Status != EFI_NOT_FOUND) {// EFI_NOT_FOUND is returned on empty input string, but we can boot without an initrd\r
-      Status = EFI_ABORTED;\r
-      goto EXIT;\r
+    InitrdSize = ReadUnaligned16 ((CONST UINT16*)&LinuxArguments->InitrdSize);\r
+    if (InitrdSize > 0) {\r
+      Print(L"File path of the initrd: ");\r
+      Status = DeviceSupport->UpdateDevicePathNode ((EFI_DEVICE_PATH*)((LinuxArguments + 1) + CmdLineSize), &InitrdPathList, NULL, NULL);\r
+      if (EFI_ERROR(Status) && Status != EFI_NOT_FOUND) {// EFI_NOT_FOUND is returned on empty input string, but we can boot without an initrd\r
+        Status = EFI_ABORTED;\r
+        goto EXIT;\r
+      }\r
+      InitrdSize = GetDevicePathSize (InitrdPathList);\r
     }\r
 \r
     Print(L"Arguments to pass to the binary: "); \r
@@ -395,7 +405,6 @@ BootMenuUpdateBootOption (
     }\r
 \r
     CmdLineSize = AsciiStrSize (CmdLine);\r
-    InitrdSize = GetDevicePathSize (InitrdPathList);\r
 \r
     BootArguments = (ARM_BDS_LOADER_ARGUMENTS*)AllocatePool(sizeof(ARM_BDS_LOADER_ARGUMENTS) + CmdLineSize + InitrdSize);\r
     BootArguments->LinuxArguments.CmdLineSize = CmdLineSize;\r
@@ -407,6 +416,7 @@ BootMenuUpdateBootOption (
   }\r
 \r
   Print(L"Description for this new Entry: ");\r
+  StrnCpy (BootDescription, BootOption->Description, BOOT_DEVICE_DESCRIPTION_MAX);\r
   Status = EditHIInputStr (BootDescription, BOOT_DEVICE_DESCRIPTION_MAX);\r
   if (EFI_ERROR(Status)) {\r
     Status = EFI_ABORTED;\r
@@ -463,11 +473,10 @@ BootMenuManager (
       }\r
       return EFI_SUCCESS;\r
     } else if ((OptionSelected > 0) && (OptionSelected <= BootManagerEntryCount))  {\r
-      Status = BootManagerEntries[OptionSelected-1].Callback (BootOptionsList);\r
+      BootManagerEntries[OptionSelected-1].Callback (BootOptionsList);\r
     }\r
   }\r
-\r
-  return EFI_SUCCESS;\r
+  // Should never go here\r
 }\r
 \r
 EFI_STATUS\r
@@ -529,22 +538,22 @@ BootMenuMain (
     {\r
       BootOption = LOAD_OPTION_FROM_LINK(Entry);\r
 \r
-      Print(L"[%d] %s\n",OptionCount,BootOption->Description);\r
+      Print(L"[%d] %s\n", OptionCount, BootOption->Description);\r
 \r
       DEBUG_CODE_BEGIN();\r
         CHAR16*                           DevicePathTxt;\r
         EFI_DEVICE_PATH_TO_TEXT_PROTOCOL* DevicePathToTextProtocol;\r
         ARM_BDS_LOADER_OPTIONAL_DATA*     OptionalData;\r
         UINTN                             CmdLineSize;\r
-        ARM_BDS_LOADER_TYPE           LoaderType;\r
+        ARM_BDS_LOADER_TYPE               LoaderType;\r
 \r
-        Status = gBS->LocateProtocol(&gEfiDevicePathToTextProtocolGuid, NULL, (VOID **)&DevicePathToTextProtocol);\r
+        Status = gBS->LocateProtocol (&gEfiDevicePathToTextProtocolGuid, NULL, (VOID **)&DevicePathToTextProtocol);\r
         if (EFI_ERROR(Status)) {\r
           // You must provide an implementation of DevicePathToTextProtocol in your firmware (eg: DevicePathDxe)\r
           DEBUG((EFI_D_ERROR,"Error: Bds requires DevicePathToTextProtocol\n"));\r
           return Status;\r
         }\r
-        DevicePathTxt = DevicePathToTextProtocol->ConvertDevicePathToText(BootOption->FilePathList,TRUE,TRUE);\r
+        DevicePathTxt = DevicePathToTextProtocol->ConvertDevicePathToText (BootOption->FilePathList, TRUE, TRUE);\r
 \r
         Print(L"\t- %s\n",DevicePathTxt);\r
 \r
@@ -609,6 +618,5 @@ BootMenuMain (
       Status = BootOptionStart (BootOption);\r
     }\r
   }\r
-\r
-  return Status;\r
+  // Should never go here\r
 }\r