]> git.proxmox.com Git - mirror_edk2.git/blobdiff - ArmPlatformPkg/Bds/BootOptionSupport.c
AppPkg: Update email and URL.
[mirror_edk2.git] / ArmPlatformPkg / Bds / BootOptionSupport.c
index 336bcb9a2127a59d08d545e388e93886e11267a0..27faf003c69e3999eb2de814844e8ab41da4321d 100644 (file)
@@ -1,6 +1,6 @@
 /** @file\r
 *\r
-*  Copyright (c) 2011, ARM Limited. All rights reserved.\r
+*  Copyright (c) 2011-2014, ARM Limited. All rights reserved.\r
 *\r
 *  This program and the accompanying materials\r
 *  are licensed and made available under the terms and conditions of the BSD License\r
 \r
 #include <Protocol/BlockIo.h>\r
 #include <Protocol/DevicePathToText.h>\r
+#include <Protocol/FirmwareVolumeBlock.h>\r
 #include <Protocol/PxeBaseCode.h>\r
 #include <Protocol/SimpleFileSystem.h>\r
 #include <Protocol/SimpleNetwork.h>\r
+#include <Protocol/Dhcp4.h>\r
+#include <Protocol/Mtftp4.h>\r
 \r
 #include <Guid/FileSystemInfo.h>\r
 \r
@@ -33,23 +36,20 @@ BdsLoadOptionFileSystemList (
 \r
 EFI_STATUS\r
 BdsLoadOptionFileSystemCreateDevicePath (\r
-  IN  BDS_SUPPORTED_DEVICE* BdsLoadOption,\r
-  OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNode,\r
-  OUT BDS_LOADER_TYPE   *BootType,\r
-  OUT UINT32      *Attributes\r
+  IN CHAR16*                    FileName,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePathNodes\r
   );\r
 \r
 EFI_STATUS\r
 BdsLoadOptionFileSystemUpdateDevicePath (\r
-  IN EFI_DEVICE_PATH *OldDevicePath,\r
-  OUT EFI_DEVICE_PATH_PROTOCOL** NewDevicePath,\r
-  OUT BDS_LOADER_TYPE *BootType,\r
-  OUT UINT32 *Attributes\r
+  IN EFI_DEVICE_PATH            *OldDevicePath,\r
+  IN CHAR16*                    FileName,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **NewDevicePath\r
   );\r
 \r
 BOOLEAN\r
 BdsLoadOptionFileSystemIsSupported (\r
-  IN BDS_LOAD_OPTION* BdsLoadOption\r
+  IN  EFI_DEVICE_PATH           *DevicePath\r
   );\r
 \r
 EFI_STATUS\r
@@ -59,23 +59,20 @@ BdsLoadOptionMemMapList (
 \r
 EFI_STATUS\r
 BdsLoadOptionMemMapCreateDevicePath (\r
-  IN  BDS_SUPPORTED_DEVICE* BdsLoadOption,\r
-  OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNode,\r
-  OUT BDS_LOADER_TYPE   *BootType,\r
-  OUT UINT32      *Attributes\r
+  IN CHAR16*                    FileName,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePathNodes\r
   );\r
 \r
 EFI_STATUS\r
 BdsLoadOptionMemMapUpdateDevicePath (\r
-  IN EFI_DEVICE_PATH *OldDevicePath,\r
-  OUT EFI_DEVICE_PATH_PROTOCOL** NewDevicePath,\r
-  OUT BDS_LOADER_TYPE *BootType,\r
-  OUT UINT32 *Attributes\r
+  IN EFI_DEVICE_PATH            *OldDevicePath,\r
+  IN CHAR16*                    FileName,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **NewDevicePath\r
   );\r
 \r
 BOOLEAN\r
 BdsLoadOptionMemMapIsSupported (\r
-  IN BDS_LOAD_OPTION* BdsLoadOption\r
+  IN  EFI_DEVICE_PATH           *DevicePath\r
   );\r
 \r
 EFI_STATUS\r
@@ -85,23 +82,20 @@ BdsLoadOptionPxeList (
 \r
 EFI_STATUS\r
 BdsLoadOptionPxeCreateDevicePath (\r
-  IN  BDS_SUPPORTED_DEVICE* BdsLoadOption,\r
-  OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNode,\r
-  OUT BDS_LOADER_TYPE   *BootType,\r
-  OUT UINT32      *Attributes\r
+  IN CHAR16*                    FileName,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePathNodes\r
   );\r
 \r
 EFI_STATUS\r
 BdsLoadOptionPxeUpdateDevicePath (\r
-  IN EFI_DEVICE_PATH *OldDevicePath,\r
-  OUT EFI_DEVICE_PATH_PROTOCOL** NewDevicePath,\r
-  OUT BDS_LOADER_TYPE *BootType,\r
-  OUT UINT32 *Attributes\r
+  IN EFI_DEVICE_PATH            *OldDevicePath,\r
+  IN CHAR16*                    FileName,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **NewDevicePath\r
   );\r
 \r
 BOOLEAN\r
 BdsLoadOptionPxeIsSupported (\r
-  IN BDS_LOAD_OPTION* BdsLoadOption\r
+  IN  EFI_DEVICE_PATH           *DevicePath\r
   );\r
 \r
 EFI_STATUS\r
@@ -111,54 +105,55 @@ BdsLoadOptionTftpList (
 \r
 EFI_STATUS\r
 BdsLoadOptionTftpCreateDevicePath (\r
-  IN  BDS_SUPPORTED_DEVICE* BdsLoadOption,\r
-  OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNode,\r
-  OUT BDS_LOADER_TYPE   *BootType,\r
-  OUT UINT32      *Attributes\r
+  IN CHAR16*                    FileName,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePathNodes\r
   );\r
 \r
 EFI_STATUS\r
 BdsLoadOptionTftpUpdateDevicePath (\r
-  IN EFI_DEVICE_PATH *OldDevicePath,\r
-  OUT EFI_DEVICE_PATH_PROTOCOL** NewDevicePath,\r
-  OUT BDS_LOADER_TYPE *BootType,\r
-  OUT UINT32 *Attributes\r
+  IN EFI_DEVICE_PATH            *OldDevicePath,\r
+  IN CHAR16*                    FileName,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **NewDevicePath\r
   );\r
 \r
 BOOLEAN\r
 BdsLoadOptionTftpIsSupported (\r
-  IN BDS_LOAD_OPTION* BdsLoadOption\r
+  IN  EFI_DEVICE_PATH           *DevicePath\r
   );\r
 \r
 BDS_LOAD_OPTION_SUPPORT BdsLoadOptionSupportList[] = {\r
-    {\r
-        BDS_DEVICE_FILESYSTEM,\r
-        BdsLoadOptionFileSystemList,\r
-        BdsLoadOptionFileSystemIsSupported,\r
-        BdsLoadOptionFileSystemCreateDevicePath,\r
-        BdsLoadOptionFileSystemUpdateDevicePath\r
-    },\r
-    {\r
-        BDS_DEVICE_MEMMAP,\r
-        BdsLoadOptionMemMapList,\r
-        BdsLoadOptionMemMapIsSupported,\r
-        BdsLoadOptionMemMapCreateDevicePath,\r
-        BdsLoadOptionMemMapUpdateDevicePath\r
-    },\r
-    {\r
-        BDS_DEVICE_PXE,\r
-        BdsLoadOptionPxeList,\r
-        BdsLoadOptionPxeIsSupported,\r
-        BdsLoadOptionPxeCreateDevicePath,\r
-        BdsLoadOptionPxeUpdateDevicePath\r
-    },\r
-    {\r
-        BDS_DEVICE_TFTP,\r
-        BdsLoadOptionTftpList,\r
-        BdsLoadOptionTftpIsSupported,\r
-        BdsLoadOptionTftpCreateDevicePath,\r
-        BdsLoadOptionTftpUpdateDevicePath\r
-    }\r
+  {\r
+    BDS_DEVICE_FILESYSTEM,\r
+    BdsLoadOptionFileSystemList,\r
+    BdsLoadOptionFileSystemIsSupported,\r
+    BdsLoadOptionFileSystemCreateDevicePath,\r
+    BdsLoadOptionFileSystemUpdateDevicePath,\r
+    TRUE\r
+  },\r
+  {\r
+    BDS_DEVICE_MEMMAP,\r
+    BdsLoadOptionMemMapList,\r
+    BdsLoadOptionMemMapIsSupported,\r
+    BdsLoadOptionMemMapCreateDevicePath,\r
+    BdsLoadOptionMemMapUpdateDevicePath,\r
+    TRUE\r
+  },\r
+  {\r
+    BDS_DEVICE_PXE,\r
+    BdsLoadOptionPxeList,\r
+    BdsLoadOptionPxeIsSupported,\r
+    BdsLoadOptionPxeCreateDevicePath,\r
+    BdsLoadOptionPxeUpdateDevicePath,\r
+    FALSE\r
+  },\r
+  {\r
+    BDS_DEVICE_TFTP,\r
+    BdsLoadOptionTftpList,\r
+    BdsLoadOptionTftpIsSupported,\r
+    BdsLoadOptionTftpCreateDevicePath,\r
+    BdsLoadOptionTftpUpdateDevicePath,\r
+    TRUE\r
+  }\r
 };\r
 \r
 EFI_STATUS\r
@@ -172,7 +167,7 @@ BootDeviceListSupportedInit (
   InitializeListHead (SupportedDeviceList);\r
 \r
   for (Index = 0; Index < BDS_DEVICE_MAX; Index++) {\r
-    BdsLoadOptionSupportList[Index].ListDevices(SupportedDeviceList);\r
+    BdsLoadOptionSupportList[Index].ListDevices (SupportedDeviceList);\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -192,7 +187,7 @@ BootDeviceListSupportedFree (
     SupportedDevice = SUPPORTED_BOOT_DEVICE_FROM_LINK(Entry);\r
     Entry = RemoveEntryList (Entry);\r
     if (SupportedDevice != Except) {\r
-      FreePool(SupportedDevice);\r
+      FreePool (SupportedDevice);\r
     }\r
   }\r
 \r
@@ -201,15 +196,15 @@ BootDeviceListSupportedFree (
 \r
 EFI_STATUS\r
 BootDeviceGetDeviceSupport (\r
-  IN  BDS_LOAD_OPTION *BootOption,\r
-  OUT BDS_LOAD_OPTION_SUPPORT**  DeviceSupport\r
+  IN  EFI_DEVICE_PATH           *DevicePath,\r
+  OUT BDS_LOAD_OPTION_SUPPORT   **DeviceSupport\r
   )\r
 {\r
   UINTN Index;\r
 \r
   // Find which supported device is the most appropriate\r
   for (Index = 0; Index < BDS_DEVICE_MAX; Index++) {\r
-    if (BdsLoadOptionSupportList[Index].IsSupported(BootOption)) {\r
+    if (BdsLoadOptionSupportList[Index].IsSupported (DevicePath)) {\r
       *DeviceSupport = &BdsLoadOptionSupportList[Index];\r
       return EFI_SUCCESS;\r
     }\r
@@ -218,57 +213,6 @@ BootDeviceGetDeviceSupport (
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-STATIC\r
-EFI_STATUS\r
-BootDeviceGetType (\r
-  IN  CHAR16* FileName,\r
-  OUT BDS_LOADER_TYPE *BootType,\r
-  OUT UINT32 *Attributes\r
-  )\r
-{\r
-  EFI_STATUS Status;\r
-  BOOLEAN IsEfiApp;\r
-  BOOLEAN IsBootLoader;\r
-  BOOLEAN     HasFDTSupport;\r
-\r
-  if (FileName == NULL) {\r
-    Print(L"Is an EFI Application? ");\r
-    Status = GetHIInputBoolean (&IsEfiApp);\r
-    if (EFI_ERROR(Status)) {\r
-      return EFI_ABORTED;\r
-    }\r
-  } else if (HasFilePathEfiExtension(FileName)) {\r
-    IsEfiApp = TRUE;\r
-  } else {\r
-    IsEfiApp = FALSE;\r
-  }\r
-\r
-  if (IsEfiApp) {\r
-    Print(L"Is your application is an OS loader? ");\r
-    Status = GetHIInputBoolean (&IsBootLoader);\r
-    if (EFI_ERROR(Status)) {\r
-      return EFI_ABORTED;\r
-    }\r
-    if (!IsBootLoader) {\r
-      *Attributes |= LOAD_OPTION_CATEGORY_APP;\r
-    }\r
-    *BootType = BDS_LOADER_EFI_APPLICATION;\r
-  } else {\r
-    Print(L"Has FDT support? ");\r
-    Status = GetHIInputBoolean (&HasFDTSupport);\r
-    if (EFI_ERROR(Status)) {\r
-      return EFI_ABORTED;\r
-    }\r
-    if (HasFDTSupport) {\r
-      *BootType = BDS_LOADER_KERNEL_LINUX_FDT;\r
-    } else {\r
-      *BootType = BDS_LOADER_KERNEL_LINUX_ATAG;\r
-    }\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
-}\r
-\r
 EFI_STATUS\r
 BdsLoadOptionFileSystemList (\r
   IN OUT LIST_ENTRY* BdsLoadOptionList\r
@@ -295,7 +239,7 @@ BdsLoadOptionFileSystemList (
     Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiDevicePathProtocolGuid, (VOID **)&DevicePathProtocol);\r
     if (!EFI_ERROR(Status)) {\r
       // Allocate BDS Supported Device structure\r
-      SupportedDevice = (BDS_SUPPORTED_DEVICE*)AllocatePool(sizeof(BDS_SUPPORTED_DEVICE));\r
+      SupportedDevice = (BDS_SUPPORTED_DEVICE*)AllocatePool (sizeof(BDS_SUPPORTED_DEVICE));\r
 \r
       FileProtocol = NULL;\r
       Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiSimpleFileSystemProtocolGuid, (VOID **)&FileProtocol);\r
@@ -327,120 +271,126 @@ BdsLoadOptionFileSystemList (
 \r
 EFI_STATUS\r
 BdsLoadOptionFileSystemCreateDevicePath (\r
-  IN  BDS_SUPPORTED_DEVICE* BdsLoadOption,\r
-  OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNode,\r
-  OUT BDS_LOADER_TYPE   *BootType,\r
-  OUT UINT32      *Attributes\r
+  IN CHAR16*                    FileName,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePathNodes\r
   )\r
 {\r
   EFI_STATUS  Status;\r
   FILEPATH_DEVICE_PATH* FilePathDevicePath;\r
-  CHAR8       AsciiBootFilePath[BOOT_DEVICE_FILEPATH_MAX];\r
-  CHAR16      *BootFilePath;\r
+  CHAR16      BootFilePath[BOOT_DEVICE_FILEPATH_MAX];\r
   UINTN       BootFilePathSize;\r
 \r
-  Status = GetHIInputAscii (AsciiBootFilePath,BOOT_DEVICE_FILEPATH_MAX);\r
+  Print(L"File path of the %s: ", FileName);\r
+  Status = GetHIInputStr (BootFilePath, BOOT_DEVICE_FILEPATH_MAX);\r
   if (EFI_ERROR(Status)) {\r
     return EFI_ABORTED;\r
   }\r
 \r
-  if (AsciiStrSize(AsciiBootFilePath) == 1) {\r
-    *DevicePathNode = NULL;\r
+  BootFilePathSize = StrSize (BootFilePath);\r
+  if (BootFilePathSize == 2) {\r
+    *DevicePathNodes = NULL;\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  // Convert Ascii into Unicode\r
-  BootFilePath = (CHAR16*)AllocatePool(AsciiStrSize(AsciiBootFilePath) * sizeof(CHAR16));\r
-  AsciiStrToUnicodeStr (AsciiBootFilePath, BootFilePath);\r
-  BootFilePathSize = StrSize(BootFilePath);\r
-\r
   // Create the FilePath Device Path node\r
-  FilePathDevicePath = (FILEPATH_DEVICE_PATH*)AllocatePool(SIZE_OF_FILEPATH_DEVICE_PATH + BootFilePathSize);\r
+  FilePathDevicePath = (FILEPATH_DEVICE_PATH*)AllocatePool(SIZE_OF_FILEPATH_DEVICE_PATH + BootFilePathSize + END_DEVICE_PATH_LENGTH);\r
   FilePathDevicePath->Header.Type = MEDIA_DEVICE_PATH;\r
   FilePathDevicePath->Header.SubType = MEDIA_FILEPATH_DP;\r
   SetDevicePathNodeLength (FilePathDevicePath, SIZE_OF_FILEPATH_DEVICE_PATH + BootFilePathSize);\r
   CopyMem (FilePathDevicePath->PathName, BootFilePath, BootFilePathSize);\r
-  FreePool (BootFilePath);\r
-\r
-  if (BootType != NULL || Attributes != NULL) {\r
-    Status = BootDeviceGetType (FilePathDevicePath->PathName, BootType, Attributes);\r
-  }\r
-\r
-  if (EFI_ERROR(Status)) {\r
-    FreePool (FilePathDevicePath);\r
-  } else {\r
-    *DevicePathNode = (EFI_DEVICE_PATH_PROTOCOL*)FilePathDevicePath;\r
-  }\r
+  SetDevicePathEndNode ((VOID*)((UINTN)FilePathDevicePath + SIZE_OF_FILEPATH_DEVICE_PATH + BootFilePathSize));\r
+  *DevicePathNodes = (EFI_DEVICE_PATH_PROTOCOL*)FilePathDevicePath;\r
 \r
   return Status;\r
 }\r
 \r
 EFI_STATUS\r
 BdsLoadOptionFileSystemUpdateDevicePath (\r
-  IN EFI_DEVICE_PATH *OldDevicePath,\r
-  OUT EFI_DEVICE_PATH_PROTOCOL** NewDevicePath,\r
-  OUT BDS_LOADER_TYPE *BootType,\r
-  OUT UINT32 *Attributes\r
+  IN EFI_DEVICE_PATH            *OldDevicePath,\r
+  IN CHAR16*                    FileName,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **NewDevicePath\r
   )\r
 {\r
   EFI_STATUS  Status;\r
-  CHAR8       AsciiBootFilePath[BOOT_DEVICE_FILEPATH_MAX];\r
-  CHAR16      *BootFilePath;\r
+  CHAR16      BootFilePath[BOOT_DEVICE_FILEPATH_MAX];\r
   UINTN       BootFilePathSize;\r
   FILEPATH_DEVICE_PATH* EndingDevicePath;\r
   FILEPATH_DEVICE_PATH* FilePathDevicePath;\r
   EFI_DEVICE_PATH*  DevicePath;\r
 \r
-  DevicePath = DuplicateDevicePath(OldDevicePath);\r
+  DevicePath = DuplicateDevicePath (OldDevicePath);\r
 \r
   EndingDevicePath = (FILEPATH_DEVICE_PATH*)GetLastDevicePathNode (DevicePath);\r
\r
-  UnicodeStrToAsciiStr (EndingDevicePath->PathName,AsciiBootFilePath);\r
-  Status = EditHIInputAscii (AsciiBootFilePath,BOOT_DEVICE_FILEPATH_MAX);\r
+\r
+  Print(L"File path of the %s: ", FileName);\r
+  StrnCpy (BootFilePath, EndingDevicePath->PathName, BOOT_DEVICE_FILEPATH_MAX);\r
+  Status = EditHIInputStr (BootFilePath, BOOT_DEVICE_FILEPATH_MAX);\r
   if (EFI_ERROR(Status)) {\r
     return Status;\r
   }\r
 \r
-  if (AsciiStrSize(AsciiBootFilePath) == 1) {\r
+  BootFilePathSize = StrSize(BootFilePath);\r
+  if (BootFilePathSize == 2) {\r
     *NewDevicePath = NULL;\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  // Convert Ascii into Unicode\r
-  BootFilePath = (CHAR16*)AllocatePool(AsciiStrSize(AsciiBootFilePath) * sizeof(CHAR16));\r
-  AsciiStrToUnicodeStr (AsciiBootFilePath, BootFilePath);\r
-  BootFilePathSize = StrSize(BootFilePath);\r
-\r
   // Create the FilePath Device Path node\r
   FilePathDevicePath = (FILEPATH_DEVICE_PATH*)AllocatePool(SIZE_OF_FILEPATH_DEVICE_PATH + BootFilePathSize);\r
   FilePathDevicePath->Header.Type = MEDIA_DEVICE_PATH;\r
   FilePathDevicePath->Header.SubType = MEDIA_FILEPATH_DP;\r
   SetDevicePathNodeLength (FilePathDevicePath, SIZE_OF_FILEPATH_DEVICE_PATH + BootFilePathSize);\r
   CopyMem (FilePathDevicePath->PathName, BootFilePath, BootFilePathSize);\r
-  FreePool (BootFilePath);\r
 \r
   // Generate the new Device Path by replacing the last node by the updated node\r
   SetDevicePathEndNode (EndingDevicePath);\r
   *NewDevicePath = AppendDevicePathNode (DevicePath, (CONST EFI_DEVICE_PATH_PROTOCOL *)FilePathDevicePath);\r
   FreePool(DevicePath);\r
 \r
-  if (BootType != NULL || Attributes != NULL) {\r
-    return BootDeviceGetType (FilePathDevicePath->PathName, BootType, Attributes);\r
-  }\r
-\r
   return EFI_SUCCESS;\r
 }\r
 \r
+/**\r
+  Check if a boot option path is a file system boot option path or not.\r
+\r
+  The device specified by the beginning of the path has to support the Simple File\r
+  System protocol. Furthermore, the remaining part of the path has to be composed of\r
+  a single node of type MEDIA_DEVICE_PATH and sub-type MEDIA_FILEPATH_DP.\r
+\r
+  @param[in]  DevicePath  Complete device path of a boot option.\r
+\r
+  @retval  FALSE  The boot option path has not been identified as that of a\r
+                  file system boot option.\r
+  @retval  TRUE   The boot option path is a file system boot option.\r
+**/\r
 BOOLEAN\r
 BdsLoadOptionFileSystemIsSupported (\r
-  IN BDS_LOAD_OPTION* BdsLoadOption\r
+  IN  EFI_DEVICE_PATH  *DevicePath\r
   )\r
 {\r
-  EFI_DEVICE_PATH*  DevicePathNode;\r
+  EFI_STATUS                        Status;\r
+  EFI_HANDLE                        Handle;\r
+  EFI_DEVICE_PATH                  *RemainingDevicePath;\r
+  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *FileProtocol;\r
 \r
-  DevicePathNode = GetLastDevicePathNode (BdsLoadOption->FilePathList);\r
+  Status = BdsConnectDevicePath (DevicePath, &Handle, &RemainingDevicePath);\r
+  if (EFI_ERROR (Status)) {\r
+    return FALSE;\r
+  }\r
 \r
-  return IS_DEVICE_PATH_NODE(DevicePathNode,MEDIA_DEVICE_PATH,MEDIA_FILEPATH_DP);\r
+  Status = gBS->HandleProtocol (\r
+                   Handle,\r
+                   &gEfiSimpleFileSystemProtocolGuid,\r
+                   (VOID **)(&FileProtocol)\r
+                   );\r
+  if (EFI_ERROR (Status)) {\r
+    return FALSE;\r
+  }\r
+\r
+  if (!IS_DEVICE_PATH_NODE (RemainingDevicePath, MEDIA_DEVICE_PATH, MEDIA_FILEPATH_DP))\r
+    return FALSE;\r
+\r
+  return TRUE;\r
 }\r
 \r
 STATIC\r
@@ -472,17 +422,19 @@ BdsLoadOptionMemMapList (
   IN OUT LIST_ENTRY* BdsLoadOptionList\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  UINTN                             HandleCount;\r
-  EFI_HANDLE                        *HandleBuffer;\r
-  UINTN                             DevicePathHandleCount;\r
-  EFI_HANDLE                        *DevicePathHandleBuffer;\r
-  BOOLEAN                           IsParent;\r
-  UINTN                             Index;\r
-  UINTN                             Index2;\r
-  BDS_SUPPORTED_DEVICE              *SupportedDevice;\r
-  EFI_DEVICE_PATH_PROTOCOL*         DevicePathProtocol;\r
-  EFI_DEVICE_PATH*                  DevicePath;\r
+  EFI_STATUS                          Status;\r
+  UINTN                               HandleCount;\r
+  EFI_HANDLE                         *HandleBuffer;\r
+  UINTN                               DevicePathHandleCount;\r
+  EFI_HANDLE                         *DevicePathHandleBuffer;\r
+  BOOLEAN                             IsParent;\r
+  UINTN                               Index;\r
+  UINTN                               Index2;\r
+  BDS_SUPPORTED_DEVICE               *SupportedDevice;\r
+  EFI_DEVICE_PATH_PROTOCOL*           DevicePathProtocol;\r
+  EFI_DEVICE_PATH*                    DevicePath;\r
+  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL    *FileProtocol;\r
+  EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *FvbProtocol;\r
 \r
   // List all the BlockIo Protocols\r
   Status = gBS->LocateHandleBuffer (ByProtocol, &gEfiBlockIoProtocolGuid, NULL, &HandleCount, &HandleBuffer);\r
@@ -491,7 +443,35 @@ BdsLoadOptionMemMapList (
   }\r
 \r
   for (Index = 0; Index < HandleCount; Index++) {\r
-    // We only select the handle WITH a Device Path AND not part of Media (to avoid duplication with HardDisk, CDROM, etc)\r
+    // We only select handles WITH a Device Path AND not part of Media (to\r
+    // avoid duplication with HardDisk, CDROM, etc). Skip handles used by\r
+    // Simple Filesystem or used for Variable Storage.\r
+\r
+\r
+    Status = gBS->HandleProtocol (HandleBuffer[Index],\r
+                                  &gEfiSimpleFileSystemProtocolGuid,\r
+                                  (VOID *)&FileProtocol);\r
+    if (!EFI_ERROR(Status)) {\r
+      // SimpleFilesystem supported on this handle, skip\r
+      continue;\r
+    }\r
+\r
+    Status = gBS->HandleProtocol (HandleBuffer[Index],\r
+                                  &gEfiFirmwareVolumeBlockProtocolGuid,\r
+                                  (VOID *)&FvbProtocol);\r
+    if (!EFI_ERROR(Status)) {\r
+      // Firmware Volme Block / Variable storage supported on this handle, skip\r
+      continue;\r
+    }\r
+\r
+    Status = gBS->HandleProtocol (HandleBuffer[Index],\r
+                                  &gEfiFirmwareVolumeBlock2ProtocolGuid,\r
+                                  (VOID *)&FvbProtocol);\r
+    if (!EFI_ERROR(Status)) {\r
+      // Firmware Volme Block / Variable storage supported on this handle, skip\r
+      continue;\r
+    }\r
+\r
     Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiDevicePathProtocolGuid, (VOID **)&DevicePathProtocol);\r
     if (!EFI_ERROR(Status)) {\r
       // BlockIo is not part of Media Device Path\r
@@ -537,82 +517,76 @@ BdsLoadOptionMemMapList (
 \r
 EFI_STATUS\r
 BdsLoadOptionMemMapCreateDevicePath (\r
-  IN  BDS_SUPPORTED_DEVICE* BdsLoadOption,\r
-  OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNode,\r
-  OUT BDS_LOADER_TYPE   *BootType,\r
-  OUT UINT32      *Attributes\r
+  IN CHAR16*                    FileName,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePathNodes\r
   )\r
 {\r
-  EFI_STATUS  Status;\r
-  MEMMAP_DEVICE_PATHMemMapDevicePath;\r
-  CHAR8       AsciiStartingAddress[BOOT_DEVICE_ADDRESS_MAX];\r
-  CHAR8       AsciiEndingAddress[BOOT_DEVICE_ADDRESS_MAX];\r
+  EFI_STATUS              Status;\r
+  MEMMAP_DEVICE_PATH      *MemMapDevicePath;\r
+  CHAR16                  StrStartingAddress[BOOT_DEVICE_ADDRESS_MAX];\r
+  CHAR16                  StrEndingAddress[BOOT_DEVICE_ADDRESS_MAX];\r
 \r
-  Print(L"Starting Address of the binary: ");\r
-  Status = GetHIInputAscii (AsciiStartingAddress,BOOT_DEVICE_ADDRESS_MAX);\r
+  Print(L"Starting Address of the %s: ", FileName);\r
+  Status = GetHIInputStr (StrStartingAddress, BOOT_DEVICE_ADDRESS_MAX);\r
   if (EFI_ERROR(Status)) {\r
     return EFI_ABORTED;\r
   }\r
 \r
-  Print(L"Ending Address of the binary: ");\r
-  Status = GetHIInputAscii (AsciiEndingAddress,BOOT_DEVICE_ADDRESS_MAX);\r
+  Print(L"Ending Address of the %s: ", FileName);\r
+  Status = GetHIInputStr (StrEndingAddress, BOOT_DEVICE_ADDRESS_MAX);\r
   if (EFI_ERROR(Status)) {\r
     return EFI_ABORTED;\r
   }\r
 \r
   // Create the MemMap Device Path Node\r
-  MemMapDevicePath = (MEMMAP_DEVICE_PATH*)AllocatePool(sizeof(MEMMAP_DEVICE_PATH));\r
+  MemMapDevicePath = (MEMMAP_DEVICE_PATH*)AllocatePool (sizeof(MEMMAP_DEVICE_PATH) + END_DEVICE_PATH_LENGTH);\r
   MemMapDevicePath->Header.Type = HARDWARE_DEVICE_PATH;\r
   MemMapDevicePath->Header.SubType = HW_MEMMAP_DP;\r
+  SetDevicePathNodeLength (MemMapDevicePath, sizeof(MEMMAP_DEVICE_PATH));\r
   MemMapDevicePath->MemoryType = EfiBootServicesData;\r
-  MemMapDevicePath->StartingAddress = AsciiStrHexToUint64 (AsciiStartingAddress);\r
-  MemMapDevicePath->EndingAddress = AsciiStrHexToUint64 (AsciiEndingAddress);\r
+  MemMapDevicePath->StartingAddress = StrHexToUint64 (StrStartingAddress);\r
+  MemMapDevicePath->EndingAddress = StrHexToUint64 (StrEndingAddress);\r
 \r
-  Status = BootDeviceGetType (NULL, BootType, Attributes);\r
-  if (EFI_ERROR(Status)) {\r
-    FreePool (MemMapDevicePath);\r
-  } else {\r
-    *DevicePathNode = (EFI_DEVICE_PATH_PROTOCOL*)MemMapDevicePath;\r
-  }\r
+  // Set a Device Path End Node after the Memory Map Device Path Node\r
+  SetDevicePathEndNode (MemMapDevicePath + 1);\r
+  *DevicePathNodes = (EFI_DEVICE_PATH_PROTOCOL*)MemMapDevicePath;\r
 \r
   return Status;\r
 }\r
 \r
 EFI_STATUS\r
 BdsLoadOptionMemMapUpdateDevicePath (\r
-  IN EFI_DEVICE_PATH *OldDevicePath,\r
-  OUT EFI_DEVICE_PATH_PROTOCOL** NewDevicePath,\r
-  OUT BDS_LOADER_TYPE *BootType,\r
-  OUT UINT32 *Attributes\r
+  IN EFI_DEVICE_PATH            *OldDevicePath,\r
+  IN CHAR16*                    FileName,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **NewDevicePath\r
   )\r
 {\r
   EFI_STATUS          Status;\r
-  CHAR8               AsciiStartingAddress[BOOT_DEVICE_ADDRESS_MAX];\r
-  CHAR8               AsciiEndingAddress[BOOT_DEVICE_ADDRESS_MAX];\r
+  CHAR16              StrStartingAddress[BOOT_DEVICE_ADDRESS_MAX];\r
+  CHAR16              StrEndingAddress[BOOT_DEVICE_ADDRESS_MAX];\r
   MEMMAP_DEVICE_PATH* EndingDevicePath;\r
   EFI_DEVICE_PATH*    DevicePath;\r
 \r
   DevicePath = DuplicateDevicePath (OldDevicePath);\r
   EndingDevicePath = (MEMMAP_DEVICE_PATH*)GetLastDevicePathNode (DevicePath);\r
 \r
-  Print(L"Starting Address of the binary: ");\r
-  AsciiSPrint (AsciiStartingAddress,BOOT_DEVICE_ADDRESS_MAX,"0x%X",(UINTN)EndingDevicePath->StartingAddress);\r
-  Status = EditHIInputAscii (AsciiStartingAddress,BOOT_DEVICE_ADDRESS_MAX);\r
+  Print(L"Starting Address of the %s: ", FileName);\r
+  UnicodeSPrint (StrStartingAddress, BOOT_DEVICE_ADDRESS_MAX, L"0x%X", (UINTN)EndingDevicePath->StartingAddress);\r
+  Status = EditHIInputStr (StrStartingAddress, BOOT_DEVICE_ADDRESS_MAX);\r
   if (EFI_ERROR(Status)) {\r
     return EFI_ABORTED;\r
   }\r
 \r
-  Print(L"Ending Address of the binary: ");\r
-  AsciiSPrint (AsciiEndingAddress,BOOT_DEVICE_ADDRESS_MAX,"0x%X",(UINTN)EndingDevicePath->EndingAddress);\r
-  Status = EditHIInputAscii (AsciiEndingAddress,BOOT_DEVICE_ADDRESS_MAX);\r
+  Print(L"Ending Address of the %s: ", FileName);\r
+  UnicodeSPrint (StrEndingAddress, BOOT_DEVICE_ADDRESS_MAX, L"0x%X", (UINTN)EndingDevicePath->EndingAddress);\r
+  Status = EditHIInputStr (StrEndingAddress, BOOT_DEVICE_ADDRESS_MAX);\r
   if (EFI_ERROR(Status)) {\r
     return EFI_ABORTED;\r
   }\r
 \r
-  EndingDevicePath->StartingAddress = AsciiStrHexToUint64 (AsciiStartingAddress);\r
-  EndingDevicePath->EndingAddress = AsciiStrHexToUint64 (AsciiEndingAddress);\r
+  EndingDevicePath->StartingAddress = StrHexToUint64 (StrStartingAddress);\r
+  EndingDevicePath->EndingAddress = StrHexToUint64 (StrEndingAddress);\r
 \r
-  Status = BootDeviceGetType (NULL, BootType, Attributes);\r
   if (EFI_ERROR(Status)) {\r
     FreePool(DevicePath);\r
   } else {\r
@@ -622,16 +596,47 @@ BdsLoadOptionMemMapUpdateDevicePath (
   return Status;\r
 }\r
 \r
+/**\r
+  Check if a boot option path is a memory map boot option path or not.\r
+\r
+  The device specified by the beginning of the path has to support the BlockIo\r
+  protocol. Furthermore, the remaining part of the path has to be composed of\r
+  a single node of type HARDWARE_DEVICE_PATH and sub-type HW_MEMMAP_DP.\r
+\r
+  @param[in]  DevicePath  Complete device path of a boot option.\r
+\r
+  @retval  FALSE  The boot option path has not been identified as that of a\r
+                  memory map boot option.\r
+  @retval  TRUE   The boot option path is a a memory map boot option.\r
+**/\r
 BOOLEAN\r
 BdsLoadOptionMemMapIsSupported (\r
-  IN BDS_LOAD_OPTION* BdsLoadOption\r
+  IN  EFI_DEVICE_PATH  *DevicePath\r
   )\r
 {\r
-  EFI_DEVICE_PATH*  DevicePathNode;\r
+  EFI_STATUS              Status;\r
+  EFI_HANDLE              Handle;\r
+  EFI_DEVICE_PATH        *RemainingDevicePath;\r
+  EFI_BLOCK_IO_PROTOCOL  *BlockIoProtocol;\r
+\r
+  Status = BdsConnectDevicePath (DevicePath, &Handle, &RemainingDevicePath);\r
+  if (EFI_ERROR (Status)) {\r
+    return FALSE;\r
+  }\r
+\r
+  Status = gBS->HandleProtocol (\r
+                  Handle,\r
+                  &gEfiBlockIoProtocolGuid,\r
+                  (VOID **)(&BlockIoProtocol)\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    return FALSE;\r
+  }\r
 \r
-  DevicePathNode = GetLastDevicePathNode (BdsLoadOption->FilePathList);\r
+  if (!IS_DEVICE_PATH_NODE (RemainingDevicePath, HARDWARE_DEVICE_PATH, HW_MEMMAP_DP))\r
+    return FALSE;\r
 \r
-  return IS_DEVICE_PATH_NODE(DevicePathNode,HARDWARE_DEVICE_PATH,HW_MEMMAP_DP);\r
+  return TRUE;\r
 }\r
 \r
 EFI_STATUS\r
@@ -662,7 +667,7 @@ BdsLoadOptionPxeList (
       // Allocate BDS Supported Device structure\r
       SupportedDevice = (BDS_SUPPORTED_DEVICE*)AllocatePool(sizeof(BDS_SUPPORTED_DEVICE));\r
 \r
-      Status = gBS->LocateProtocol (&gEfiSimpleNetworkProtocolGuid, NULL, (VOID **)&SimpleNet);\r
+      Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiSimpleNetworkProtocolGuid, (VOID **)&SimpleNet);\r
       if (!EFI_ERROR(Status)) {\r
         Mac = &SimpleNet->Mode->CurrentAddress;\r
         UnicodeSPrint (DeviceDescription,BOOT_DEVICE_DESCRIPTION_MAX,L"MAC Address: %02x:%02x:%02x:%02x:%02x:%02x", Mac->Addr[0],  Mac->Addr[1],  Mac->Addr[2],  Mac->Addr[3],  Mac->Addr[4],  Mac->Addr[5]);\r
@@ -684,33 +689,50 @@ BdsLoadOptionPxeList (
 \r
 EFI_STATUS\r
 BdsLoadOptionPxeCreateDevicePath (\r
-  IN  BDS_SUPPORTED_DEVICE* BdsLoadOption,\r
-  OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNode,\r
-  OUT BDS_LOADER_TYPE   *BootType,\r
-  OUT UINT32      *Attributes\r
+  IN CHAR16*                    FileName,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePathNodes\r
   )\r
 {\r
-  *DevicePathNode = (EFI_DEVICE_PATH_PROTOCOL *) AllocatePool (END_DEVICE_PATH_LENGTH);\r
-  SetDevicePathEndNode (*DevicePathNode);\r
-  *BootType = BDS_LOADER_EFI_APPLICATION;\r
+  *DevicePathNodes = (EFI_DEVICE_PATH_PROTOCOL *) AllocatePool (END_DEVICE_PATH_LENGTH);\r
+  SetDevicePathEndNode (*DevicePathNodes);\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
+/**\r
+  Update the parameters of a Pxe boot option\r
+\r
+  @param[in]   OldDevicePath  Current complete device path of the Pxe boot option.\r
+                              This has to be a valid complete Pxe boot option path.\r
+  @param[in]   FileName       Description of the file the path is asked for\r
+  @param[out]  NewDevicePath  Pointer to the new complete device path.\r
+\r
+  @retval  EFI_SUCCESS            Update completed\r
+  @retval  EFI_OUT_OF_RESOURCES   Fail to perform the update due to lack of resource\r
+**/\r
 EFI_STATUS\r
 BdsLoadOptionPxeUpdateDevicePath (\r
-  IN EFI_DEVICE_PATH *OldDevicePath,\r
-  OUT EFI_DEVICE_PATH_PROTOCOL** NewDevicePath,\r
-  OUT BDS_LOADER_TYPE *BootType,\r
-  OUT UINT32 *Attributes\r
+  IN EFI_DEVICE_PATH            *OldDevicePath,\r
+  IN CHAR16*                    FileName,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **NewDevicePath\r
   )\r
 {\r
-  ASSERT (0);\r
-  return EFI_SUCCESS;\r
+  //\r
+  // Make a copy of the complete device path that is made of :\r
+  // the device path of the device supporting the Pxe base code protocol\r
+  // followed by an end node.\r
+  //\r
+  *NewDevicePath = DuplicateDevicePath (OldDevicePath);\r
+  if (*NewDevicePath == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
+  } else {\r
+    return EFI_SUCCESS;\r
+  }\r
 }\r
 \r
 BOOLEAN\r
 BdsLoadOptionPxeIsSupported (\r
-  IN BDS_LOAD_OPTION* BdsLoadOption\r
+  IN  EFI_DEVICE_PATH  *DevicePath\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -718,7 +740,7 @@ BdsLoadOptionPxeIsSupported (
   EFI_DEVICE_PATH_PROTOCOL  *RemainingDevicePath;\r
   EFI_PXE_BASE_CODE_PROTOCOL  *PxeBcProtocol;\r
 \r
-  Status = BdsConnectDevicePath (BdsLoadOption->FilePathList, &Handle, &RemainingDevicePath);\r
+  Status = BdsConnectDevicePath (DevicePath, &Handle, &RemainingDevicePath);\r
   if (EFI_ERROR(Status)) {\r
     return FALSE;\r
   }\r
@@ -735,49 +757,96 @@ BdsLoadOptionPxeIsSupported (
   }\r
 }\r
 \r
+/**\r
+  Add to the list of boot devices the devices allowing a TFTP boot\r
+\r
+  @param[in]   BdsLoadOptionList  List of devices to boot from\r
+\r
+  @retval  EFI_SUCCESS            Update completed\r
+  @retval  EFI_OUT_OF_RESOURCES   Fail to perform the update due to lack of resource\r
+**/\r
 EFI_STATUS\r
 BdsLoadOptionTftpList (\r
   IN OUT LIST_ENTRY* BdsLoadOptionList\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  UINTN                             HandleCount;\r
-  EFI_HANDLE                        *HandleBuffer;\r
-  UINTN                             Index;\r
-  BDS_SUPPORTED_DEVICE              *SupportedDevice;\r
-  EFI_DEVICE_PATH_PROTOCOL*         DevicePathProtocol;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL*      SimpleNet;\r
-  CHAR16                            DeviceDescription[BOOT_DEVICE_DESCRIPTION_MAX];\r
-  EFI_MAC_ADDRESS                   *Mac;\r
-\r
-  // List all the PXE Protocols\r
-  Status = gBS->LocateHandleBuffer (ByProtocol, &gEfiPxeBaseCodeProtocolGuid, NULL, &HandleCount, &HandleBuffer);\r
+  EFI_STATUS                   Status;\r
+  UINTN                        HandleCount;\r
+  EFI_HANDLE                   *HandleBuffer;\r
+  EFI_HANDLE                   Handle;\r
+  UINTN                        Index;\r
+  EFI_DEVICE_PATH_PROTOCOL     *DevicePathProtocol;\r
+  VOID                         *Interface;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL  *SimpleNetworkProtocol;\r
+  BDS_SUPPORTED_DEVICE         *SupportedDevice;\r
+  EFI_MAC_ADDRESS              *Mac;\r
+\r
+  //\r
+  // List all the handles on which the Simple Network Protocol is installed.\r
+  //\r
+  Status = gBS->LocateHandleBuffer (\r
+                  ByProtocol,\r
+                  &gEfiSimpleNetworkProtocolGuid,\r
+                  NULL,\r
+                  &HandleCount,\r
+                  &HandleBuffer\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   for (Index = 0; Index < HandleCount; Index++) {\r
-    // We only select the handle WITH a Device Path AND the PXE Protocol AND the TFTP Protocol (the TFTP protocol is required to start PXE)\r
-    Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiDevicePathProtocolGuid, (VOID **)&DevicePathProtocol);\r
-    if (!EFI_ERROR(Status)) {\r
-      // Allocate BDS Supported Device structure\r
-      SupportedDevice = (BDS_SUPPORTED_DEVICE*)AllocatePool(sizeof(BDS_SUPPORTED_DEVICE));\r
+    Handle = HandleBuffer[Index];\r
+    //\r
+    // We select the handles that support :\r
+    // . the Device Path Protocol\r
+    // . the MTFTP4 Protocol\r
+    //\r
+    Status = gBS->HandleProtocol (\r
+                    Handle,\r
+                    &gEfiDevicePathProtocolGuid,\r
+                    (VOID **)&DevicePathProtocol\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      continue;\r
+    }\r
 \r
-      Status = gBS->LocateProtocol (&gEfiSimpleNetworkProtocolGuid, NULL, (VOID **)&SimpleNet);\r
-      if (!EFI_ERROR(Status)) {\r
-        Mac = &SimpleNet->Mode->CurrentAddress;\r
-        UnicodeSPrint (DeviceDescription,BOOT_DEVICE_DESCRIPTION_MAX,L"MAC Address: %02x:%02x:%02x:%02x:%02x:%02x", Mac->Addr[0],  Mac->Addr[1],  Mac->Addr[2],  Mac->Addr[3],  Mac->Addr[4],  Mac->Addr[5]);\r
-      } else {\r
-        Status = GenerateDeviceDescriptionName (HandleBuffer[Index], DeviceDescription);\r
-        ASSERT_EFI_ERROR (Status);\r
-      }\r
-      UnicodeSPrint (SupportedDevice->Description,BOOT_DEVICE_DESCRIPTION_MAX,L"TFP on %s",DeviceDescription);\r
+    Status = gBS->HandleProtocol (\r
+                    Handle,\r
+                    &gEfiMtftp4ServiceBindingProtocolGuid,\r
+                    &Interface\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      continue;\r
+    }\r
 \r
-      SupportedDevice->DevicePathProtocol = DevicePathProtocol;\r
-      SupportedDevice->Support = &BdsLoadOptionSupportList[BDS_DEVICE_TFTP];\r
+    Status = gBS->HandleProtocol (\r
+                    Handle,\r
+                    &gEfiSimpleNetworkProtocolGuid,\r
+                    (VOID **)&SimpleNetworkProtocol\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      continue;\r
+    }\r
 \r
-      InsertTailList (BdsLoadOptionList,&SupportedDevice->Link);\r
+    // Allocate BDS Supported Device structure\r
+    SupportedDevice = (BDS_SUPPORTED_DEVICE*)AllocatePool (sizeof (BDS_SUPPORTED_DEVICE));\r
+    if (SupportedDevice == NULL) {\r
+      continue;\r
     }\r
+\r
+    Mac = &SimpleNetworkProtocol->Mode->CurrentAddress;\r
+    UnicodeSPrint (\r
+      SupportedDevice->Description,\r
+      BOOT_DEVICE_DESCRIPTION_MAX,\r
+      L"TFTP on MAC Address: %02x:%02x:%02x:%02x:%02x:%02x",\r
+      Mac->Addr[0],  Mac->Addr[1],  Mac->Addr[2],  Mac->Addr[3],  Mac->Addr[4],  Mac->Addr[5]\r
+      );\r
+\r
+    SupportedDevice->DevicePathProtocol = DevicePathProtocol;\r
+    SupportedDevice->Support = &BdsLoadOptionSupportList[BDS_DEVICE_TFTP];\r
+\r
+    InsertTailList (BdsLoadOptionList, &SupportedDevice->Link);\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -785,61 +854,76 @@ BdsLoadOptionTftpList (
 \r
 EFI_STATUS\r
 BdsLoadOptionTftpCreateDevicePath (\r
-  IN  BDS_SUPPORTED_DEVICE* BdsLoadOption,\r
-  OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNode,\r
-  OUT BDS_LOADER_TYPE   *BootType,\r
-  OUT UINT32      *Attributes\r
+  IN CHAR16*                    FileName,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePathNodes\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
-  BOOLEAN       IsDHCP;\r
-  EFI_IP_ADDRESS  LocalIp;\r
-  EFI_IP_ADDRESS  RemoteIp;\r
-  IPv4_DEVICE_PATH*   IPv4DevicePathNode;\r
-  FILEPATH_DEVICE_PATH* FilePathDevicePath;\r
-  CHAR8       AsciiBootFilePath[BOOT_DEVICE_FILEPATH_MAX];\r
-  CHAR16*     BootFilePath;\r
-  UINTN       BootFilePathSize;\r
-\r
-  Print(L"Get the IP address from DHCP: ");\r
+  EFI_STATUS            Status;\r
+  BOOLEAN               IsDHCP;\r
+  EFI_IP_ADDRESS        LocalIp;\r
+  EFI_IP_ADDRESS        SubnetMask;\r
+  EFI_IP_ADDRESS        GatewayIp;\r
+  EFI_IP_ADDRESS        RemoteIp;\r
+  IPv4_DEVICE_PATH      *IPv4DevicePathNode;\r
+  FILEPATH_DEVICE_PATH  *FilePathDevicePath;\r
+  CHAR16                BootFilePath[BOOT_DEVICE_FILEPATH_MAX];\r
+  UINTN                 BootFilePathSize;\r
+\r
+  Print (L"Get the IP address from DHCP: ");\r
   Status = GetHIInputBoolean (&IsDHCP);\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     return EFI_ABORTED;\r
   }\r
 \r
   if (!IsDHCP) {\r
-    Print(L"Get the static IP address: ");\r
+    Print (L"Local static IP address: ");\r
     Status = GetHIInputIP (&LocalIp);\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
+      return EFI_ABORTED;\r
+    }\r
+    Print (L"Get the network mask: ");\r
+    Status = GetHIInputIP (&SubnetMask);\r
+    if (EFI_ERROR (Status)) {\r
+      return EFI_ABORTED;\r
+    }\r
+    Print (L"Get the gateway IP address: ");\r
+    Status = GetHIInputIP (&GatewayIp);\r
+    if (EFI_ERROR (Status)) {\r
       return EFI_ABORTED;\r
     }\r
   }\r
 \r
-  Print(L"Get the TFTP server IP address: ");\r
+  Print (L"Get the TFTP server IP address: ");\r
   Status = GetHIInputIP (&RemoteIp);\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     return EFI_ABORTED;\r
   }\r
 \r
-  Print(L"File path of the EFI Application or the kernel: ");\r
-  Status = GetHIInputAscii (AsciiBootFilePath,BOOT_DEVICE_FILEPATH_MAX);\r
-  if (EFI_ERROR(Status)) {\r
+  Print (L"File path of the %s : ", FileName);\r
+  Status = GetHIInputStr (BootFilePath, BOOT_DEVICE_FILEPATH_MAX);\r
+  if (EFI_ERROR (Status)) {\r
     return EFI_ABORTED;\r
   }\r
 \r
-  // Convert Ascii into Unicode\r
-  BootFilePath = (CHAR16*)AllocatePool(AsciiStrSize(AsciiBootFilePath) * sizeof(CHAR16));\r
-  AsciiStrToUnicodeStr (AsciiBootFilePath, BootFilePath);\r
   BootFilePathSize = StrSize(BootFilePath);\r
+  if (BootFilePathSize == 2) {\r
+    return EFI_NOT_FOUND;\r
+  }\r
 \r
   // Allocate the memory for the IPv4 + File Path Device Path Nodes\r
-  IPv4DevicePathNode = (IPv4_DEVICE_PATH*)AllocatePool(sizeof(IPv4_DEVICE_PATH) + SIZE_OF_FILEPATH_DEVICE_PATH + BootFilePathSize);\r
+  IPv4DevicePathNode = (IPv4_DEVICE_PATH*)AllocatePool(sizeof(IPv4_DEVICE_PATH) + SIZE_OF_FILEPATH_DEVICE_PATH + BootFilePathSize + END_DEVICE_PATH_LENGTH);\r
 \r
   // Create the IPv4 Device Path\r
   IPv4DevicePathNode->Header.Type    = MESSAGING_DEVICE_PATH;\r
   IPv4DevicePathNode->Header.SubType = MSG_IPv4_DP;\r
   SetDevicePathNodeLength (&IPv4DevicePathNode->Header, sizeof(IPv4_DEVICE_PATH));\r
-  CopyMem (&IPv4DevicePathNode->LocalIpAddress, &LocalIp.v4, sizeof (EFI_IPv4_ADDRESS));\r
+\r
+  if (!IsDHCP) {\r
+    CopyMem (&IPv4DevicePathNode->LocalIpAddress, &LocalIp.v4, sizeof (EFI_IPv4_ADDRESS));\r
+    CopyMem (&IPv4DevicePathNode->SubnetMask, &SubnetMask.v4, sizeof (EFI_IPv4_ADDRESS));\r
+    CopyMem (&IPv4DevicePathNode->GatewayIpAddress, &GatewayIp.v4, sizeof (EFI_IPv4_ADDRESS));\r
+  }\r
+\r
   CopyMem (&IPv4DevicePathNode->RemoteIpAddress, &RemoteIp.v4, sizeof (EFI_IPv4_ADDRESS));\r
   IPv4DevicePathNode->LocalPort  = 0;\r
   IPv4DevicePathNode->RemotePort = 0;\r
@@ -852,33 +936,227 @@ BdsLoadOptionTftpCreateDevicePath (
   FilePathDevicePath->Header.SubType = MEDIA_FILEPATH_DP;\r
   SetDevicePathNodeLength (FilePathDevicePath, SIZE_OF_FILEPATH_DEVICE_PATH + BootFilePathSize);\r
   CopyMem (FilePathDevicePath->PathName, BootFilePath, BootFilePathSize);\r
-  FreePool (BootFilePath);\r
 \r
-  Status = BootDeviceGetType (NULL, BootType, Attributes);\r
-  if (EFI_ERROR(Status)) {\r
-    FreePool (IPv4DevicePathNode);\r
-  } else {\r
-    *DevicePathNode = (EFI_DEVICE_PATH_PROTOCOL*)IPv4DevicePathNode;\r
-  }\r
+  // Set the End Device Path Node\r
+  SetDevicePathEndNode ((VOID*)((UINTN)FilePathDevicePath + SIZE_OF_FILEPATH_DEVICE_PATH + BootFilePathSize));\r
+  *DevicePathNodes = (EFI_DEVICE_PATH_PROTOCOL*)IPv4DevicePathNode;\r
 \r
   return Status;\r
 }\r
 \r
+/**\r
+  Update the parameters of a TFTP boot option\r
+\r
+  The function asks sequentially to update the IPv4 parameters as well as the boot file path,\r
+  providing the previously set value if any.\r
+\r
+  @param[in]   OldDevicePath  Current complete device path of the Tftp boot option.\r
+                              This has to be a valid complete Tftp boot option path.\r
+                              By complete, we mean that it is not only the Tftp\r
+                              specific end part built by the\r
+                              "BdsLoadOptionTftpCreateDevicePath()" function.\r
+                              This path is handled as read only.\r
+  @param[in]   FileName       Description of the file the path is asked for\r
+  @param[out]  NewDevicePath  Pointer to the new complete device path.\r
+\r
+  @retval  EFI_SUCCESS            Update completed\r
+  @retval  EFI_ABORTED            Update aborted by the user\r
+  @retval  EFI_OUT_OF_RESOURCES   Fail to perform the update due to lack of resource\r
+**/\r
 EFI_STATUS\r
 BdsLoadOptionTftpUpdateDevicePath (\r
-  IN EFI_DEVICE_PATH *OldDevicePath,\r
-  OUT EFI_DEVICE_PATH_PROTOCOL** NewDevicePath,\r
-  OUT BDS_LOADER_TYPE *BootType,\r
-  OUT UINT32 *Attributes\r
+  IN   EFI_DEVICE_PATH            *OldDevicePath,\r
+  IN   CHAR16                     *FileName,\r
+  OUT  EFI_DEVICE_PATH_PROTOCOL  **NewDevicePath\r
   )\r
 {\r
-  ASSERT (0);\r
-  return EFI_SUCCESS;\r
+  EFI_STATUS             Status;\r
+  EFI_DEVICE_PATH       *DevicePath;\r
+  EFI_DEVICE_PATH       *DevicePathNode;\r
+  UINT8                 *Ipv4NodePtr;\r
+  IPv4_DEVICE_PATH       Ipv4Node;\r
+  BOOLEAN                IsDHCP;\r
+  EFI_IP_ADDRESS         OldIp;\r
+  EFI_IP_ADDRESS         OldSubnetMask;\r
+  EFI_IP_ADDRESS         OldGatewayIp;\r
+  EFI_IP_ADDRESS         LocalIp;\r
+  EFI_IP_ADDRESS         SubnetMask;\r
+  EFI_IP_ADDRESS         GatewayIp;\r
+  EFI_IP_ADDRESS         RemoteIp;\r
+  UINT8                 *FileNodePtr;\r
+  CHAR16                 BootFilePath[BOOT_DEVICE_FILEPATH_MAX];\r
+  UINTN                  PathSize;\r
+  UINTN                  BootFilePathSize;\r
+  FILEPATH_DEVICE_PATH  *NewFilePathNode;\r
+\r
+  Ipv4NodePtr = NULL;\r
+\r
+  //\r
+  // Make a copy of the complete device path that is made of :\r
+  // the device path of the device that support the Simple Network protocol\r
+  // followed by an IPv4 node (type IPv4_DEVICE_PATH),\r
+  // followed by a file path node (type FILEPATH_DEVICE_PATH) and ended up\r
+  // by an end node. The IPv6 case is not handled yet.\r
+  //\r
+\r
+  DevicePath = DuplicateDevicePath (OldDevicePath);\r
+  if (DevicePath == NULL) {\r
+    Status = EFI_OUT_OF_RESOURCES;\r
+    goto ErrorExit;\r
+  }\r
+\r
+  //\r
+  // Because of the check done by "BdsLoadOptionTftpIsSupported()" prior to the\r
+  // call to this function, we know that the device path ends with an IPv4 node\r
+  // followed by a file path node and finally an end node. To get the address of\r
+  // the last IPv4 node, we loop over the whole device path, noting down the\r
+  // address of each encountered IPv4 node.\r
+  //\r
+\r
+  for (DevicePathNode = DevicePath;\r
+       !IsDevicePathEnd (DevicePathNode);\r
+       DevicePathNode = NextDevicePathNode (DevicePathNode))\r
+  {\r
+    if (IS_DEVICE_PATH_NODE (DevicePathNode, MESSAGING_DEVICE_PATH, MSG_IPv4_DP)) {\r
+      Ipv4NodePtr = (UINT8*)DevicePathNode;\r
+    }\r
+  }\r
+\r
+  // Copy for alignment of the IPv4 node data\r
+  CopyMem (&Ipv4Node, Ipv4NodePtr, sizeof (IPv4_DEVICE_PATH));\r
+\r
+  Print (L"Get the IP address from DHCP: ");\r
+  Status = GetHIInputBoolean (&IsDHCP);\r
+  if (EFI_ERROR (Status)) {\r
+    goto ErrorExit;\r
+  }\r
+\r
+  if (!IsDHCP) {\r
+    Print (L"Local static IP address: ");\r
+    if (Ipv4Node.StaticIpAddress) {\r
+      CopyMem (&OldIp.v4, &Ipv4Node.LocalIpAddress, sizeof (EFI_IPv4_ADDRESS));\r
+      Status = EditHIInputIP (&OldIp, &LocalIp);\r
+    } else {\r
+      Status = GetHIInputIP (&LocalIp);\r
+    }\r
+    if (EFI_ERROR (Status)) {\r
+      goto ErrorExit;\r
+    }\r
+\r
+    Print (L"Get the network mask: ");\r
+    if (Ipv4Node.StaticIpAddress) {\r
+      CopyMem (&OldSubnetMask.v4, &Ipv4Node.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
+      Status = EditHIInputIP (&OldSubnetMask, &SubnetMask);\r
+    } else {\r
+      Status = GetHIInputIP (&SubnetMask);\r
+    }\r
+    if (EFI_ERROR (Status)) {\r
+      goto ErrorExit;\r
+    }\r
+\r
+    Print (L"Get the gateway IP address: ");\r
+    if (Ipv4Node.StaticIpAddress) {\r
+      CopyMem (&OldGatewayIp.v4, &Ipv4Node.GatewayIpAddress, sizeof (EFI_IPv4_ADDRESS));\r
+      Status = EditHIInputIP (&OldGatewayIp, &GatewayIp);\r
+    } else {\r
+      Status = GetHIInputIP (&GatewayIp);\r
+    }\r
+    if (EFI_ERROR (Status)) {\r
+      goto ErrorExit;\r
+    }\r
+  }\r
+\r
+  Print (L"TFTP server IP address: ");\r
+  // Copy remote IPv4 address into IPv4 or IPv6 union\r
+  CopyMem (&OldIp.v4, &Ipv4Node.RemoteIpAddress, sizeof (EFI_IPv4_ADDRESS));\r
+\r
+  Status = EditHIInputIP (&OldIp, &RemoteIp);\r
+  if (EFI_ERROR (Status)) {\r
+    goto ErrorExit;\r
+  }\r
+\r
+  // Get the path of the boot file and its size in number of bytes\r
+  FileNodePtr = Ipv4NodePtr + sizeof (IPv4_DEVICE_PATH);\r
+  BootFilePathSize = DevicePathNodeLength (FileNodePtr) - SIZE_OF_FILEPATH_DEVICE_PATH;\r
+\r
+  //\r
+  // Ask for update of the boot file path\r
+  //\r
+  do {\r
+    // Copy for 2-byte alignment of the Unicode string\r
+    CopyMem (\r
+      BootFilePath, FileNodePtr + SIZE_OF_FILEPATH_DEVICE_PATH,\r
+      MIN (BootFilePathSize, BOOT_DEVICE_FILEPATH_MAX)\r
+      );\r
+    BootFilePath[BOOT_DEVICE_FILEPATH_MAX - 1] = L'\0';\r
+\r
+    Print (L"File path of the %s: ", FileName);\r
+    Status = EditHIInputStr (BootFilePath, BOOT_DEVICE_FILEPATH_MAX);\r
+    if (EFI_ERROR (Status)) {\r
+      goto ErrorExit;\r
+    }\r
+    PathSize = StrSize (BootFilePath);\r
+    if (PathSize > 2) {\r
+      break;\r
+    }\r
+    // Empty string, give the user another try\r
+    Print (L"Empty string - Invalid path\n");\r
+  } while (PathSize <= 2) ;\r
+\r
+  //\r
+  // Update the IPv4 node. IPv6 case not handled yet.\r
+  //\r
+  if (IsDHCP) {\r
+    Ipv4Node.StaticIpAddress = FALSE;\r
+    ZeroMem (&Ipv4Node.LocalIpAddress, sizeof (EFI_IPv4_ADDRESS));\r
+    ZeroMem (&Ipv4Node.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
+    ZeroMem (&Ipv4Node.GatewayIpAddress, sizeof (EFI_IPv4_ADDRESS));\r
+  } else {\r
+    Ipv4Node.StaticIpAddress = TRUE;\r
+    CopyMem (&Ipv4Node.LocalIpAddress, &LocalIp.v4, sizeof (EFI_IPv4_ADDRESS));\r
+    CopyMem (&Ipv4Node.SubnetMask, &SubnetMask.v4, sizeof (EFI_IPv4_ADDRESS));\r
+    CopyMem (&Ipv4Node.GatewayIpAddress, &GatewayIp.v4, sizeof (EFI_IPv4_ADDRESS));\r
+  }\r
+\r
+  CopyMem (&Ipv4Node.RemoteIpAddress, &RemoteIp.v4, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (Ipv4NodePtr, &Ipv4Node, sizeof (IPv4_DEVICE_PATH));\r
+\r
+  //\r
+  // Create the new file path node\r
+  //\r
+  NewFilePathNode = (FILEPATH_DEVICE_PATH*)AllocatePool (\r
+                                             SIZE_OF_FILEPATH_DEVICE_PATH +\r
+                                             PathSize\r
+                                             );\r
+  NewFilePathNode->Header.Type    = MEDIA_DEVICE_PATH;\r
+  NewFilePathNode->Header.SubType = MEDIA_FILEPATH_DP;\r
+  SetDevicePathNodeLength (\r
+    NewFilePathNode,\r
+    SIZE_OF_FILEPATH_DEVICE_PATH + PathSize\r
+    );\r
+  CopyMem (NewFilePathNode->PathName, BootFilePath, PathSize);\r
+\r
+  //\r
+  // Generate the new Device Path by replacing the file path node at address\r
+  // "FileNodePtr" by the new one "NewFilePathNode" and return its address.\r
+  //\r
+  SetDevicePathEndNode (FileNodePtr);\r
+  *NewDevicePath = AppendDevicePathNode (\r
+                     DevicePath,\r
+                     (CONST EFI_DEVICE_PATH_PROTOCOL*)NewFilePathNode\r
+                     );\r
+\r
+ErrorExit:\r
+  if (DevicePath != NULL) {\r
+    FreePool (DevicePath) ;\r
+  }\r
+\r
+  return Status;\r
 }\r
 \r
 BOOLEAN\r
 BdsLoadOptionTftpIsSupported (\r
-  IN BDS_LOAD_OPTION* BdsLoadOption\r
+  IN  EFI_DEVICE_PATH           *DevicePath\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -887,7 +1165,7 @@ BdsLoadOptionTftpIsSupported (
   EFI_DEVICE_PATH  *NextDevicePath;\r
   EFI_PXE_BASE_CODE_PROTOCOL  *PxeBcProtocol;\r
 \r
-  Status = BdsConnectDevicePath (BdsLoadOption->FilePathList, &Handle, &RemainingDevicePath);\r
+  Status = BdsConnectDevicePath (DevicePath, &Handle, &RemainingDevicePath);\r
   if (EFI_ERROR(Status)) {\r
     return FALSE;\r
   }\r