X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FApplication%2FCapsuleApp%2FCapsuleOnDisk.c;fp=MdeModulePkg%2FApplication%2FCapsuleApp%2FCapsuleOnDisk.c;h=a11683d66c77a878c4b27f5eef24e831881e282e;hp=df43a436f2c070a62f043426ec703a4719fb45fd;hb=57ec204e69138f5ff46cf6712692213332a8599b;hpb=425d8d487fe20e76281fd7da074592508d03f9c0 diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c b/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c index df43a436f2..a11683d66c 100644 --- a/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c +++ b/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c @@ -23,8 +23,6 @@ #include #include -#define MAX_CAPSULE_NUM 10 - EFI_GUID mCapsuleOnDiskBootOptionGuid = { 0x4CC29BB7, 0x2413, 0x40A2, { 0xB0, 0x6D, 0x25, 0x3E, 0x37, 0x10, 0xF5, 0x32 } }; /** @@ -746,41 +744,6 @@ SetCapsuleStatusVariable ( return Status; } -/** - Check if Capsule On Disk is supported. - - @retval TRUE Capsule On Disk is supported. - @retval FALSE Capsule On Disk is not supported. - -**/ -BOOLEAN -IsCapsuleOnDiskSupported ( - VOID - ) -{ - EFI_STATUS Status; - UINT64 OsIndicationsSupported; - UINTN DataSize; - - DataSize = sizeof(UINT64); - Status = gRT->GetVariable ( - L"OsIndicationsSupported", - &gEfiGlobalVariableGuid, - NULL, - &DataSize, - &OsIndicationsSupported - ); - if (EFI_ERROR (Status)) { - return FALSE; - } - - if (OsIndicationsSupported & EFI_OS_INDICATIONS_FILE_CAPSULE_DELIVERY_SUPPORTED) { - return TRUE; - } - - return FALSE; -} - /** Process Capsule On Disk. @@ -807,16 +770,6 @@ ProcessCapsuleOnDisk ( UINT16 BootNext; EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *Fs; BOOLEAN UpdateBootNext; - CHAR16 *FileName[MAX_CAPSULE_NUM]; - UINTN Index; - - // - // Check if Capsule On Disk is supported - // - if (!IsCapsuleOnDiskSupported ()) { - Print (L"CapsuleApp: Capsule On Disk is not supported.\n"); - return EFI_UNSUPPORTED; - } // // Get a valid file system from boot path @@ -829,17 +782,10 @@ ProcessCapsuleOnDisk ( return Status; } - // - // Get file name from file path - // - for (Index = 0; Index < CapsuleNum; Index ++) { - FileName[Index] = GetFileNameFromPath (FilePath[Index]); - } - // // Copy capsule image to '\efi\UpdateCapsule\' // - Status = WriteUpdateFile (CapsuleBuffer, CapsuleBufferSize, FileName, CapsuleNum, Fs); + Status = WriteUpdateFile (CapsuleBuffer, CapsuleBufferSize, FilePath, CapsuleNum, Fs); if (EFI_ERROR (Status)) { Print (L"CapsuleApp: capsule image could not be copied for update.\n"); return Status;