OrgACRN
/
slimbootloader
mirror of https://github.com/slimbootloader/slimbootloader.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Config Data name for SPI boot is Updated. 

Boot Options updated for selecting boot device as SPI.
Use the “Memory” setting in the ConfigEditor to select
SPI as boot device.

Signed-off-by: Mutha <naga.naveen.mutha@intel.com>
This commit is contained in:
Mutha 2020-05-12 20:02:09 +05:30 committed by Maurice Ma
parent 47a15937a1
commit 26499043d2
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PayloadPkg/OsLoader/LoadImage.c
View File

@ -164,9 +164,9 @@ GetBootImageFromRawPartition (
return Status;
}
LoadedImage->IasImage.Addr = Buffer;
LoadedImage->IasImage.Size = (UINT32)ImageSize;
LoadedImage->IasImage.AllocType = ImageAllocateTypePage;
LoadedImage->ImageData.Addr = Buffer;
LoadedImage->ImageData.Size = (UINT32)ImageSize;
LoadedImage->ImageData.AllocType = ImageAllocateTypePage;
if ( *((UINT32 *) Buffer) == CONTAINER_BOOT_SIGNATURE ) {
LoadedImage->Flags |= LOADED_IMAGE_CONTAINER;
} else if ( *((UINT32 *) Buffer) == IAS_MAGIC_PATTERN ) {
@ -248,9 +248,9 @@ GetBootImageFromFs (
}
DEBUG ((DEBUG_INFO, "Get file '%s' (size:0x%x) success.\n", FilePath, ImageSize));
LoadedImage->IasImage.Addr = Image;
LoadedImage->IasImage.Size = (UINT32)ImageSize;
LoadedImage->IasImage.AllocType = ImageAllocateTypePage;
LoadedImage->ImageData.Addr = Image;
LoadedImage->ImageData.Size = (UINT32)ImageSize;
LoadedImage->ImageData.AllocType = ImageAllocateTypePage;
if ( *((UINT32 *) Image) == CONTAINER_BOOT_SIGNATURE ) {
LoadedImage->Flags |= LOADED_IMAGE_CONTAINER;
} else if ( *((UINT32 *) Image) == IAS_MAGIC_PATTERN ) {
@ -605,7 +605,7 @@ UnloadLoadedImage (
//
// Free Boot Image Data loaded from FS or RAW partition
//
FreeImageData (&LoadedImage->IasImage);
FreeImageData (&LoadedImage->ImageData);
//
// Free Common Boot & Cmdline Data

8
PayloadPkg/OsLoader/OsLoader.c
View File

@ -194,7 +194,7 @@ ParseContainerImage (
IMAGE_DATA File[MAX_IAS_SUB_IMAGE];
UINT8 Index;
ContainerHdr = (CONTAINER_HDR *)LoadedImage->IasImage.Addr;
ContainerHdr = (CONTAINER_HDR *)LoadedImage->ImageData.Addr;
if (ContainerHdr->Signature != CONTAINER_BOOT_SIGNATURE) {
return EFI_UNSUPPORTED;
}
@ -207,7 +207,7 @@ ParseContainerImage (
ZeroMem (File, sizeof (File));
DEBUG ((DEBUG_INFO, "CONTAINER size = 0x%x, image type = 0x%x, # of components = %d\n", LoadedImage->IasImage.Size, ContainerHdr->ImageType, ContainerHdr->Count));
DEBUG ((DEBUG_INFO, "CONTAINER size = 0x%x, image type = 0x%x, # of components = %d\n", LoadedImage->ImageData.Size, ContainerHdr->ImageType, ContainerHdr->Count));
// Enumerate all components
Index = 0;
@ -286,7 +286,7 @@ ParseIasImage (
COMPONENT_CALLBACK_INFO CompInfo;
EFI_STATUS Status;
IasImage = IsIasImageValid (LoadedImage->IasImage.Addr, LoadedImage->IasImage.Size, &IasImageInfo);
IasImage = IsIasImageValid (LoadedImage->ImageData.Addr, LoadedImage->ImageData.Size, &IasImageInfo);
if (IasImage == NULL) {
DEBUG ((DEBUG_INFO, "Image given is not a valid IAS image\n"));
return EFI_LOAD_ERROR;
@ -308,7 +308,7 @@ ParseIasImage (
ZeroMem (File, sizeof (File));
NumFiles = IasGetFiles (IasImage, sizeof (File) / sizeof ((File)[0]), File);
DEBUG ((DEBUG_INFO, "IAS size = 0x%x, file number: %d\n", LoadedImage->IasImage.Size, NumFiles));
DEBUG ((DEBUG_INFO, "IAS size = 0x%x, file number: %d\n", LoadedImage->ImageData.Size, NumFiles));
ImageType = IAS_IMAGE_TYPE (IasImage->ImageType);
DEBUG ((DEBUG_INFO, "IAS Image Type = 0x%x\n", ImageType));

2
PayloadPkg/OsLoader/OsLoader.h
View File

@ -132,7 +132,7 @@ typedef struct {
UINT8 Flags;
UINT8 LoadImageType;
UINT16 Reserved;
IMAGE_DATA IasImage;
IMAGE_DATA ImageData;
EFI_HANDLE HwPartHandle;
LOADED_IMAGE_TYPE Image;
UINT8 ImageHash[HASH_DIGEST_MAX];

2
Platform/CommonBoardPkg/CfgData/Template_BootOption.dsc
View File

@ -34,7 +34,7 @@
gCfgData.Reserved_$(1) | * | 0x01 | 0x5A
# !BSF NAME:{Boot Device type}
# !BSF TYPE:{Combo}
# !BSF OPTION:{0:SATA, 1:SD, 2:EMMC, 3:UFS, 4:SPI, 5:USB, 6:NVME, 7:MAX}
# !BSF OPTION:{0:SATA, 1:SD, 2:EMMC, 3:UFS, 4:SPI, 5:USB, 6:NVME, 7:MEMORY}
# !BSF HELP:{Specify boot device type}
# !BSF ORDER:{0000.0000}
# !BSF CONDITION:{$ImageType_$(1) < 0xFE}