/** @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
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
+ OUT BOOLEAN *RequestBootType\r
);\r
\r
EFI_STATUS\r
BdsLoadOptionFileSystemUpdateDevicePath (\r
- IN BDS_LOAD_OPTION *BootOption,\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
+ OUT BOOLEAN *RequestBootType\r
);\r
\r
BOOLEAN\r
BdsLoadOptionFileSystemIsSupported (\r
- IN BDS_LOAD_OPTION* BdsLoadOption\r
+ IN EFI_DEVICE_PATH *DevicePath\r
);\r
\r
EFI_STATUS\r
\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
+ OUT BOOLEAN *RequestBootType\r
);\r
\r
EFI_STATUS\r
BdsLoadOptionMemMapUpdateDevicePath (\r
- IN BDS_LOAD_OPTION *BootOption,\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
+ OUT BOOLEAN *RequestBootType\r
);\r
\r
BOOLEAN\r
BdsLoadOptionMemMapIsSupported (\r
- IN BDS_LOAD_OPTION* BdsLoadOption\r
+ IN EFI_DEVICE_PATH *DevicePath\r
);\r
\r
EFI_STATUS\r
\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
+ OUT BOOLEAN *RequestBootType\r
);\r
\r
EFI_STATUS\r
BdsLoadOptionPxeUpdateDevicePath (\r
- IN BDS_LOAD_OPTION *BootOption,\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
+ OUT BOOLEAN *RequestBootType\r
);\r
\r
BOOLEAN\r
BdsLoadOptionPxeIsSupported (\r
- IN BDS_LOAD_OPTION* BdsLoadOption\r
+ IN EFI_DEVICE_PATH *DevicePath\r
);\r
\r
EFI_STATUS\r
\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
+ OUT BOOLEAN *RequestBootType\r
);\r
\r
EFI_STATUS\r
BdsLoadOptionTftpUpdateDevicePath (\r
- IN BDS_LOAD_OPTION *BootOption,\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
+ OUT BOOLEAN *RequestBootType\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
+ },\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
\r
EFI_STATUS\r
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
\r
EFI_STATUS\r
BootDeviceListSupportedFree (\r
- IN LIST_ENTRY *SupportedDeviceList\r
+ IN LIST_ENTRY *SupportedDeviceList,\r
+ IN BDS_SUPPORTED_DEVICE *Except\r
)\r
{\r
LIST_ENTRY *Entry;\r
while (Entry != SupportedDeviceList) {\r
SupportedDevice = SUPPORTED_BOOT_DEVICE_FROM_LINK(Entry);\r
Entry = RemoveEntryList (Entry);\r
- FreePool(SupportedDevice);\r
+ if (SupportedDevice != Except) {\r
+ FreePool (SupportedDevice);\r
+ }\r
}\r
\r
return EFI_SUCCESS;\r
\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
return EFI_UNSUPPORTED;\r
}\r
\r
-STATIC\r
EFI_STATUS\r
BootDeviceGetType (\r
- IN CHAR16* FileName,\r
- OUT BDS_LOADER_TYPE *BootType,\r
+ IN EFI_DEVICE_PATH* DevicePath,\r
+ OUT ARM_BDS_LOADER_TYPE *BootType,\r
OUT UINT32 *Attributes\r
)\r
{\r
- EFI_STATUS Status;\r
- BOOLEAN IsEfiApp;\r
- BOOLEAN IsBootLoader;\r
- BOOLEAN HasFDTSupport;\r
+ EFI_STATUS Status;\r
+ BOOLEAN IsEfiApp;\r
+ BOOLEAN IsBootLoader;\r
+ BOOLEAN HasFDTSupport;\r
+ CHAR16* FileName;\r
+ EFI_DEVICE_PATH* PrevDevicePathNode;\r
+ EFI_DEVICE_PATH* DevicePathNode;\r
+ EFI_PHYSICAL_ADDRESS Image;\r
+ UINTN FileSize;\r
+ EFI_IMAGE_DOS_HEADER* DosHeader;\r
+ UINTN PeCoffHeaderOffset;\r
+ EFI_IMAGE_NT_HEADERS32* NtHeader;\r
+\r
+ //\r
+ // Check if the last node of the device path is a FilePath node\r
+ //\r
+ PrevDevicePathNode = NULL;\r
+ DevicePathNode = DevicePath;\r
+ while ((DevicePathNode != NULL) && !IsDevicePathEnd (DevicePathNode)) {\r
+ PrevDevicePathNode = DevicePathNode;\r
+ DevicePathNode = NextDevicePathNode (DevicePathNode);\r
+ }\r
+\r
+ if ((PrevDevicePathNode != NULL) &&\r
+ (PrevDevicePathNode->Type == MEDIA_DEVICE_PATH) &&\r
+ (PrevDevicePathNode->SubType == MEDIA_FILEPATH_DP))\r
+ {\r
+ FileName = ((FILEPATH_DEVICE_PATH*)PrevDevicePathNode)->PathName;\r
+ } else {\r
+ FileName = NULL;\r
+ }\r
\r
if (FileName == NULL) {\r
Print(L"Is an EFI Application? ");\r
} else if (HasFilePathEfiExtension(FileName)) {\r
IsEfiApp = TRUE;\r
} else {\r
- IsEfiApp = FALSE;\r
+ // Check if the file exist\r
+ Status = BdsLoadImage (DevicePath, AllocateAnyPages, &Image, &FileSize);\r
+ if (!EFI_ERROR (Status)) {\r
+\r
+ DosHeader = (EFI_IMAGE_DOS_HEADER *)(UINTN) Image;\r
+ if (DosHeader->e_magic == EFI_IMAGE_DOS_SIGNATURE) {\r
+ //\r
+ // DOS image header is present,\r
+ // so read the PE header after the DOS image header.\r
+ //\r
+ PeCoffHeaderOffset = DosHeader->e_lfanew;\r
+ } else {\r
+ PeCoffHeaderOffset = 0;\r
+ }\r
+\r
+ //\r
+ // Check PE/COFF image.\r
+ //\r
+ NtHeader = (EFI_IMAGE_NT_HEADERS32 *)(UINTN) (Image + PeCoffHeaderOffset);\r
+ if (NtHeader->Signature != EFI_IMAGE_NT_SIGNATURE) {\r
+ IsEfiApp = FALSE;\r
+ } else {\r
+ IsEfiApp = TRUE;\r
+ }\r
+\r
+ // Free memory\r
+ gBS->FreePages (Image, EFI_SIZE_TO_PAGES(FileSize));\r
+ } else {\r
+ // If we did not manage to open it then ask for the type\r
+ Print(L"Is an EFI Application? ");\r
+ Status = GetHIInputBoolean (&IsEfiApp);\r
+ if (EFI_ERROR(Status)) {\r
+ return EFI_ABORTED;\r
+ }\r
+ }\r
}\r
\r
if (IsEfiApp) {\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
+ SupportedDevice = (BDS_SUPPORTED_DEVICE*)AllocatePool (sizeof(BDS_SUPPORTED_DEVICE));\r
\r
FileProtocol = NULL;\r
Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiSimpleFileSystemProtocolGuid, (VOID **)&FileProtocol);\r
\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
+ OUT BOOLEAN *RequestBootType\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
- Print(L"File path of the EFI Application or the kernel: ");\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
- // Convert Ascii into Unicode\r
- BootFilePath = (CHAR16*)AllocatePool(AsciiStrSize(AsciiBootFilePath) * sizeof(CHAR16));\r
- AsciiStrToUnicodeStr (AsciiBootFilePath, BootFilePath);\r
- BootFilePathSize = StrSize(BootFilePath);\r
+ BootFilePathSize = StrSize (BootFilePath);\r
+ if (BootFilePathSize == 2) {\r
+ *DevicePathNodes = NULL;\r
+ return EFI_NOT_FOUND;\r
+ }\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
- Status = BootDeviceGetType (FilePathDevicePath->PathName, BootType, Attributes);\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 BDS_LOAD_OPTION *BootOption,\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
+ OUT BOOLEAN *RequestBootType\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 (BootOption->FilePathList);\r
- EndingDevicePath = (FILEPATH_DEVICE_PATH*)GetLastDevicePathNode (DevicePath);\r
+ DevicePath = DuplicateDevicePath (OldDevicePath);\r
\r
- Print(L"File path of the EFI Application or the kernel: ");\r
- UnicodeStrToAsciiStr (EndingDevicePath->PathName,AsciiBootFilePath);\r
- Status = EditHIInputAscii (AsciiBootFilePath,BOOT_DEVICE_FILEPATH_MAX);\r
+ EndingDevicePath = (FILEPATH_DEVICE_PATH*)GetLastDevicePathNode (DevicePath);\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
- // 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
+ *NewDevicePath = NULL;\r
+ return EFI_NOT_FOUND;\r
+ }\r
\r
// Create the FilePath Device Path node\r
FilePathDevicePath = (FILEPATH_DEVICE_PATH*)AllocatePool(SIZE_OF_FILEPATH_DEVICE_PATH + BootFilePathSize);\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
- return BootDeviceGetType (FilePathDevicePath->PathName, BootType, Attributes);\r
+ return EFI_SUCCESS;\r
}\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
\r
- DevicePathNode = GetLastDevicePathNode (BdsLoadOption->FilePathList);\r
+ DevicePathNode = GetLastDevicePathNode (DevicePath);\r
\r
return IS_DEVICE_PATH_NODE(DevicePathNode,MEDIA_DEVICE_PATH,MEDIA_FILEPATH_DP);\r
}\r
\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
+ OUT BOOLEAN *RequestBootType\r
)\r
{\r
- EFI_STATUS Status;\r
- MEMMAP_DEVICE_PATH* MemMapDevicePath;\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 BDS_LOAD_OPTION *BootOption,\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
+ OUT BOOLEAN *RequestBootType\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 (BootOption->FilePathList);\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
\r
BOOLEAN\r
BdsLoadOptionMemMapIsSupported (\r
- IN BDS_LOAD_OPTION* BdsLoadOption\r
+ IN EFI_DEVICE_PATH *DevicePath\r
)\r
{\r
EFI_DEVICE_PATH* DevicePathNode;\r
\r
- DevicePathNode = GetLastDevicePathNode (BdsLoadOption->FilePathList);\r
+ DevicePathNode = GetLastDevicePathNode (DevicePath);\r
\r
return IS_DEVICE_PATH_NODE(DevicePathNode,HARDWARE_DEVICE_PATH,HW_MEMMAP_DP);\r
}\r
\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
+ OUT BOOLEAN *RequestBootType\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
+ if (RequestBootType) {\r
+ *RequestBootType = FALSE;\r
+ }\r
return EFI_SUCCESS;\r
}\r
\r
EFI_STATUS\r
BdsLoadOptionPxeUpdateDevicePath (\r
- IN BDS_LOAD_OPTION *BootOption,\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
+ OUT BOOLEAN *RequestBootType\r
)\r
{\r
ASSERT (0);\r
- return EFI_SUCCESS;\r
+ return EFI_UNSUPPORTED;\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
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
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
+ UnicodeSPrint (SupportedDevice->Description,BOOT_DEVICE_DESCRIPTION_MAX,L"TFTP on %s",DeviceDescription);\r
\r
SupportedDevice->DevicePathProtocol = DevicePathProtocol;\r
SupportedDevice->Support = &BdsLoadOptionSupportList[BDS_DEVICE_TFTP];\r
\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
+ OUT BOOLEAN *RequestBootType\r
)\r
{\r
EFI_STATUS Status;\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
+ CHAR16 BootFilePath[BOOT_DEVICE_FILEPATH_MAX];\r
UINTN BootFilePathSize;\r
\r
Print(L"Get the IP address from DHCP: ");\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
+ 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
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
EFI_STATUS\r
BdsLoadOptionTftpUpdateDevicePath (\r
- IN BDS_LOAD_OPTION *BootOption,\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
+ OUT BOOLEAN *RequestBootType\r
)\r
{\r
ASSERT (0);\r
- return EFI_SUCCESS;\r
+ return EFI_UNSUPPORTED;\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
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
projects / mirror_edk2.git / blobdiff