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

This structure is defined by the UEFI specification and has a better location in BdsLib.

ArmPlatformPkg/Bds: Encapsulate the BDS_LOAD_OPTION into a list entry structure

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12312 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Include/Library/BdsLib.h b/ArmPkg/Include/Library/BdsLib.h
index b7aa7249253b7c5da7459385d7e8bf3829bf1923..91c67e726ee75287c50c116d46537894e1177cea 100644 (file)
--- a/ArmPkg/Include/Library/BdsLib.h
+++ b/ArmPkg/Include/Library/BdsLib.h
@@ -15,6 +15,25 @@
 #ifndef __BDS_ENTRY_H__\r
 #define __BDS_ENTRY_H__\r
 \r
+typedef UINT8* EFI_LOAD_OPTION;\r
+\r
+/**\r
+  This is defined by the UEFI specs, don't change it\r
+**/\r
+typedef struct {\r
+  UINT16                      LoadOptionIndex;\r
+  EFI_LOAD_OPTION             LoadOption;\r
+  UINTN                       LoadOptionSize;\r
+\r
+  UINT32                      Attributes;\r
+  UINT16                      FilePathListLength;\r
+  CHAR16                      *Description;\r
+  EFI_DEVICE_PATH_PROTOCOL    *FilePathList;\r
+\r
+  VOID*                       OptionalData;\r
+  UINTN                       OptionalDataSize;\r
+} BDS_LOAD_OPTION;\r
+\r
 /**\r
   Connect a Device Path and return the handle of the driver that support this DevicePath\r
 \r

diff --git a/ArmPlatformPkg/Bds/BdsInternal.h b/ArmPlatformPkg/Bds/BdsInternal.h
index d4c438b01067a9ccbf6fe63ed21e014615d98434..3f2d1a63d213e7030adf86335f7383a97cdf3953 100644 (file)
--- a/ArmPlatformPkg/Bds/BdsInternal.h
+++ b/ArmPlatformPkg/Bds/BdsInternal.h
@@ -71,6 +71,11 @@ typedef struct {
   ARM_BDS_LOADER_ARGUMENTS            Arguments;\r
 } ARM_BDS_LOADER_OPTIONAL_DATA;\r
 \r
+typedef struct {\r
+  LIST_ENTRY                  Link;\r
+  BDS_LOAD_OPTION*            BdsLoadOption;\r
+} BDS_LOAD_OPTION_ENTRY;\r
+\r
 typedef enum {\r
   BDS_DEVICE_FILESYSTEM = 0,\r
   BDS_DEVICE_MEMMAP,\r
@@ -88,23 +93,6 @@ typedef struct {
 \r
 #define SUPPORTED_BOOT_DEVICE_FROM_LINK(a)   BASE_CR(a, BDS_SUPPORTED_DEVICE, Link)\r
 \r
-typedef UINT8* EFI_LOAD_OPTION;\r
-\r
-/* This is defined by the UEFI specs, don't change it */\r
-typedef struct {\r
-  LIST_ENTRY                  Link;\r
-\r
-  UINT16                      LoadOptionIndex;\r
-  EFI_LOAD_OPTION             LoadOption;\r
-  UINTN                       LoadOptionSize;\r
-\r
-  UINT32                      Attributes;\r
-  UINT16                      FilePathListLength;\r
-  CHAR16                      *Description;\r
-  EFI_DEVICE_PATH_PROTOCOL    *FilePathList;\r
-  BDS_LOADER_OPTIONAL_DATA    *OptionalData;\r
-} BDS_LOAD_OPTION;\r
-\r
 typedef struct _BDS_LOAD_OPTION_SUPPORT {\r
   BDS_SUPPORTED_DEVICE_TYPE   Type;\r
   EFI_STATUS    (*ListDevices)(IN OUT LIST_ENTRY* BdsLoadOptionList);\r
@@ -113,7 +101,8 @@ typedef struct _BDS_LOAD_OPTION_SUPPORT {
   EFI_STATUS    (*UpdateDevicePathNode)(IN EFI_DEVICE_PATH *OldDevicePath, OUT EFI_DEVICE_PATH_PROTOCOL** NewDevicePath, OUT ARM_BDS_LOADER_TYPE *BootType, OUT UINT32 *Attributes);\r
 } BDS_LOAD_OPTION_SUPPORT;\r
 \r
-#define LOAD_OPTION_FROM_LINK(a)   BASE_CR(a, BDS_LOAD_OPTION, Link)\r
+#define LOAD_OPTION_ENTRY_FROM_LINK(a)  BASE_CR(a, BDS_LOAD_OPTION_ENTRY, Link)\r
+#define LOAD_OPTION_FROM_LINK(a)        ((BDS_LOAD_OPTION_ENTRY*)BASE_CR(a, BDS_LOAD_OPTION_ENTRY, Link))->BdsLoadOption\r
 \r
 EFI_STATUS\r
 GetEnvironmentVariable (\r

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

diff --git a/ArmPlatformPkg/Bds/BootOption.c b/ArmPlatformPkg/Bds/BootOption.c
index f6090d266dcf97e5fc2acee748c153ec8738324f..6a5f010abe85467cbcf36a74e8c453c98b2c98e0 100644 (file)
--- a/ArmPlatformPkg/Bds/BootOption.c
+++ b/ArmPlatformPkg/Bds/BootOption.c
@@ -22,7 +22,6 @@ BootOptionStart (
   )\r
 {\r
   EFI_STATUS                            Status;\r
-  EFI_DEVICE_PATH*                      FdtDevicePath;\r
   EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL*   EfiDevicePathFromTextProtocol;\r
   UINT32                                LoaderType;\r
   ARM_BDS_LOADER_OPTIONAL_DATA*         OptionalData;\r
@@ -34,6 +33,7 @@ BootOptionStart (
   UINTN                                 InitrdSize;\r
   EFI_DEVICE_PATH*                      Initrd;\r
 \r
+  if (IS_ARM_BDS_BOOTENTRY (BootOption)) {\r
     Status = EFI_UNSUPPORTED;\r
     OptionalData = BootOption->OptionalData;\r
     LoaderType = ReadUnaligned32 ((CONST UINT32*)&OptionalData->Header.LoaderType);\r
@@ -83,6 +83,10 @@ BootOptionStart (
                                 Initrd, // Initrd\r
                                 (CHAR8*)(LinuxArguments + 1),\r
                                 FdtDevicePath);\r
+    }\r
+  } else {\r
+    Status = BdsStartEfiApplication (mImageHandle, BootOption->FilePathList);\r
+  }\r
 \r
   return Status;\r
 }\r
@@ -159,11 +163,12 @@ BootOptionList (
   IN OUT LIST_ENTRY *BootOptionList\r
   )\r
 {\r
-  EFI_STATUS        Status;\r
-  UINTN             Index;\r
-  UINT16            *BootOrder;\r
-  UINTN             BootOrderSize;\r
-  BDS_LOAD_OPTION   *BdsLoadOption;\r
+  EFI_STATUS                    Status;\r
+  UINTN                         Index;\r
+  UINT16*                       BootOrder;\r
+  UINTN                         BootOrderSize;\r
+  BDS_LOAD_OPTION*              BdsLoadOption;\r
+  BDS_LOAD_OPTION_ENTRY*        BdsLoadOptionEntry;\r
 \r
   InitializeListHead (BootOptionList);\r
 \r
@@ -176,7 +181,9 @@ BootOptionList (
   for (Index = 0; Index < BootOrderSize / sizeof (UINT16); Index++) {\r
     Status = BootOptionFromLoadOptionVariable (BootOrder[Index],&BdsLoadOption);\r
     if (!EFI_ERROR(Status)) {\r
-      InsertTailList (BootOptionList,&BdsLoadOption->Link);\r
+      BdsLoadOptionEntry = (BDS_LOAD_OPTION_ENTRY*)AllocatePool(sizeof(BDS_LOAD_OPTION_ENTRY));\r
+      BdsLoadOptionEntry->BdsLoadOption = BdsLoadOption;\r
+      InsertTailList (BootOptionList,&BdsLoadOptionEntry->Link);\r
     }\r
   }\r
 \r
@@ -327,21 +334,24 @@ BootOptionCreate (
   IN  EFI_DEVICE_PATH_PROTOCOL* DevicePath,\r
   IN  ARM_BDS_LOADER_TYPE       BootType,\r
   IN  ARM_BDS_LOADER_ARGUMENTS* BootArguments,\r
-  OUT BDS_LOAD_OPTION           **BdsLoadOption\r
+  OUT BDS_LOAD_OPTION**         BdsLoadOption\r
   )\r
 {\r
-  EFI_STATUS        Status;\r
-  BDS_LOAD_OPTION   *BootOption;\r
-  CHAR16            BootVariableName[9];\r
-  UINT16            *BootOrder;\r
-  UINTN             BootOrderSize;\r
+  EFI_STATUS                    Status;\r
+  BDS_LOAD_OPTION_ENTRY*        BootOptionEntry;\r
+  BDS_LOAD_OPTION*              BootOption;\r
+  CHAR16                        BootVariableName[9];\r
+  UINT16*                       BootOrder;\r
+  UINTN                         BootOrderSize;\r
 \r
   //\r
   // Allocate and fill the memory for the BDS Load Option structure\r
   //\r
-  BootOption = (BDS_LOAD_OPTION*)AllocateZeroPool(sizeof(BDS_LOAD_OPTION));\r
+  BootOptionEntry = (BDS_LOAD_OPTION_ENTRY*)AllocatePool (sizeof (BDS_LOAD_OPTION_ENTRY));\r
+  InitializeListHead (&BootOptionEntry->Link);\r
+  BootOptionEntry->BdsLoadOption = (BDS_LOAD_OPTION*)AllocateZeroPool (sizeof(BDS_LOAD_OPTION));\r
 \r
-  InitializeListHead (&BootOption->Link);\r
+  BootOption = BootOptionEntry->BdsLoadOption;\r
   BootOptionSetFields (BootOption, Attributes, BootDescription, DevicePath, BootType, BootArguments);\r
 \r
   //\r
@@ -419,17 +429,11 @@ BootOptionDelete (
   IN  BDS_LOAD_OPTION *BootOption\r
   )\r
 {\r
-  UINTN Index;\r
-  UINTN BootOrderSize;\r
-  UINT16* BootOrder;\r
-  UINTN BootOrderCount;\r
-  EFI_STATUS  Status;\r
-\r
-  // If the Boot Optiono was attached to a list remove it\r
-  if (!IsListEmpty (&BootOption->Link)) {\r
-    // Remove the entry from the list\r
-    RemoveEntryList (&BootOption->Link);\r
-  }\r
+  UINTN         Index;\r
+  UINTN         BootOrderSize;\r
+  UINT16*       BootOrder;\r
+  UINTN         BootOrderCount;\r
+  EFI_STATUS    Status;\r
 \r
   // Remove the entry from the BootOrder environment variable\r
   Status = GetEnvironmentVariable (L"BootOrder", NULL, &BootOrderSize, (VOID**)&BootOrder);\r