ArmPkg/BdsLib: Move the Generic BDS_LOAD_OPTION structure from Armplatform/Pkg to...

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

diff --git a/ArmPlatformPkg/Bds/BootMenu.c b/ArmPlatformPkg/Bds/BootMenu.c
index 8aa09596fdcbaed2637d3044e876ea6660eb60a2..d583c02256219a8410adda0b6ee061f0bb6ad02e 100644 (file)
--- a/ArmPlatformPkg/Bds/BootMenu.c
+++ b/ArmPlatformPkg/Bds/BootMenu.c
@@ -120,7 +120,7 @@ BootMenuAddBootOption (
   CHAR8                     CmdLine[BOOT_DEVICE_OPTION_MAX];\r
   UINT32                    Attributes;\r
   ARM_BDS_LOADER_TYPE       BootType;\r
-  BDS_LOAD_OPTION          *BdsLoadOption;\r
+  BDS_LOAD_OPTION_ENTRY     *BdsLoadOptionEntry;\r
   EFI_DEVICE_PATH           *DevicePath;\r
   EFI_DEVICE_PATH_PROTOCOL  *DevicePathNode;\r
   EFI_DEVICE_PATH_PROTOCOL  *InitrdPathNode;\r
@@ -192,9 +192,10 @@ BootMenuAddBootOption (
   }\r
 \r
   // Create new entry\r
-  Status = BootOptionCreate (Attributes, BootDescription, DevicePath, BootType, &BootArguments, &BdsLoadOption);\r
+  BdsLoadOptionEntry = (BDS_LOAD_OPTION_ENTRY*)AllocatePool (sizeof(BDS_LOAD_OPTION_ENTRY));\r
+  Status = BootOptionCreate (Attributes, BootDescription, DevicePath, BootType, BootArguments, &BdsLoadOptionEntry->BdsLoadOption);\r
   if (!EFI_ERROR(Status)) {\r
-    InsertTailList (BootOptionsList,&BdsLoadOption->Link);\r
+    InsertTailList (BootOptionsList, &BdsLoadOptionEntry->Link);\r
   }\r
 \r
 FREE_DEVICE_PATH:\r
@@ -212,36 +213,43 @@ EXIT:
 STATIC\r
 EFI_STATUS\r
 BootMenuSelectBootOption (\r
-  IN  LIST_ENTRY *BootOptionsList,\r
-  IN  CONST CHAR16* InputStatement,\r
-  OUT BDS_LOAD_OPTION **BdsLoadOption\r
+  IN  LIST_ENTRY*               BootOptionsList,\r
+  IN  CONST CHAR16*             InputStatement,\r
+  IN  BOOLEAN                   OnlyArmBdsBootEntry,\r
+  OUT BDS_LOAD_OPTION_ENTRY**   BdsLoadOptionEntry\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
-  LIST_ENTRY*   Entry;\r
-  BDS_LOAD_OPTION *BootOption;\r
-  UINTN         BootOptionSelected;\r
-  UINTN         BootOptionCount;\r
-  UINTN         Index;\r
+  EFI_STATUS                    Status;\r
+  LIST_ENTRY*                   Entry;\r
+  BDS_LOAD_OPTION*              BdsLoadOption;\r
+  UINTN                         BootOptionSelected;\r
+  UINTN                         BootOptionCount;\r
+  UINTN                         Index;\r
 \r
   // Display the list of supported boot devices\r
   BootOptionCount = 1;\r
   for (Entry = GetFirstNode (BootOptionsList);\r
        !IsNull (BootOptionsList,Entry);\r
-       Entry = GetNextNode (BootOptionsList,Entry)\r
+       Entry = GetNextNode (BootOptionsList, Entry)\r
        )\r
   {\r
-    BootOption = LOAD_OPTION_FROM_LINK(Entry);\r
-    Print(L"[%d] %s\n",BootOptionCount,BootOption->Description);\r
+    BdsLoadOption = LOAD_OPTION_FROM_LINK(Entry);\r
+\r
+    if (OnlyArmBdsBootEntry && !IS_ARM_BDS_BOOTENTRY (BdsLoadOption)) {\r
+      continue;\r
+    }\r
+\r
+    Print (L"[%d] %s\n", BootOptionCount, BdsLoadOption->Description);\r
 \r
     DEBUG_CODE_BEGIN();\r
       CHAR16*                           DevicePathTxt;\r
       EFI_DEVICE_PATH_TO_TEXT_PROTOCOL* DevicePathToTextProtocol;\r
       ARM_BDS_LOADER_TYPE               LoaderType;\r
+      ARM_BDS_LOADER_OPTIONAL_DATA*     OptionalData;\r
 \r
       Status = gBS->LocateProtocol(&gEfiDevicePathToTextProtocolGuid, NULL, (VOID **)&DevicePathToTextProtocol);\r
       ASSERT_EFI_ERROR(Status);\r
-      DevicePathTxt = DevicePathToTextProtocol->ConvertDevicePathToText(BootOption->FilePathList,TRUE,TRUE);\r
+      DevicePathTxt = DevicePathToTextProtocol->ConvertDevicePathToText(BdsLoadOption->FilePathList,TRUE,TRUE);\r
 \r
       Print(L"\t- %s\n",DevicePathTxt);\r
       OptionalData = BdsLoadOption->OptionalData;\r
@@ -256,6 +264,11 @@ BootMenuSelectBootOption (
     BootOptionCount++;\r
   }\r
 \r
+  if (BootOptionCount == 0) {\r
+    Print (L"No supported Boot Entry.\n");\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
   // Get the index of the boot device to delete\r
   BootOptionSelected = 0;\r
   while (BootOptionSelected == 0) {\r
@@ -277,7 +290,7 @@ BootMenuSelectBootOption (
        )\r
   {\r
     if (Index == BootOptionSelected) {\r
-      *BdsLoadOption = LOAD_OPTION_FROM_LINK(Entry);\r
+      *BdsLoadOptionEntry = LOAD_OPTION_ENTRY_FROM_LINK(Entry);\r
       break;\r
     }\r
     Index++;\r
@@ -291,16 +304,22 @@ BootMenuRemoveBootOption (
   IN LIST_ENTRY *BootOptionsList\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
-  BDS_LOAD_OPTION *BootOption;\r
+  EFI_STATUS                    Status;\r
+  BDS_LOAD_OPTION_ENTRY*        BootOptionEntry;\r
 \r
-  Status = BootMenuSelectBootOption (BootOptionsList,L"Delete entry: ",&BootOption);\r
+  Status = BootMenuSelectBootOption (BootOptionsList, L"Delete entry: ", FALSE, &BootOptionEntry);\r
   if (EFI_ERROR(Status)) {\r
     return Status;\r
   }\r
 \r
+  // If the Boot Option was attached to a list remove it\r
+  if (!IsListEmpty (&BootOptionEntry->Link)) {\r
+    // Remove the entry from the list\r
+    RemoveEntryList (&BootOptionEntry->Link);\r
+  }\r
+\r
   // Delete the BDS Load option structures\r
-  BootOptionDelete (BootOption);\r
+  BootOptionDelete (BootOptionEntry->BdsLoadOption);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -311,6 +330,7 @@ BootMenuUpdateBootOption (
   )\r
 {\r
   EFI_STATUS                    Status;\r
+  BDS_LOAD_OPTION_ENTRY         *BootOptionEntry;\r
   BDS_LOAD_OPTION               *BootOption;\r
   BDS_LOAD_OPTION_SUPPORT*      DeviceSupport;\r
   ARM_BDS_LOADER_ARGUMENTS*     BootArguments;\r
@@ -324,10 +344,11 @@ BootMenuUpdateBootOption (
   UINTN                         InitrdSize;\r
   UINTN                         CmdLineSize;\r
 \r
-  Status = BootMenuSelectBootOption (BootOptionsList,L"Update entry: ",&BootOption);\r
+  Status = BootMenuSelectBootOption (BootOptionsList, L"Update 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
@@ -494,10 +515,10 @@ BootMenuMain (
   BootOption              = NULL;\r
   BootMainEntryCount = sizeof(BootMainEntries) / sizeof(struct BOOT_MAIN_ENTRY);\r
 \r
-  // Get Boot#### list\r
-  BootOptionList (&BootOptionsList);\r
-\r
   while (TRUE) {\r
+    // Get Boot#### list\r
+    BootOptionList (&BootOptionsList);\r
+\r
     OptionCount = 1;\r
 \r
     // Display the Boot options\r