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

Fix invalid addendum update in OsBootOption (#452) 

OsBootOption config data provides addendum field to support multiple boot
option config data into a single boot option.
This patch updates a single boot option properly with multiple addendums.

Signed-off-by: Aiden Park <aiden.park@intel.com>
This commit is contained in:
Aiden Park 2019-11-13 09:49:37 -08:00 committed by GitHub
parent ae3c5ae9b5
commit a340937fbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BootloaderCommonPkg/Library/ShellLib/CmdBoot.c
View File

@ -334,6 +334,7 @@ PrintBootOption (
) )
{ {
UINT32 Index; UINT32 Index;
UINT32 ExtraIndex;
OS_BOOT_OPTION *BootOption; OS_BOOT_OPTION *BootOption;
ShellPrint (L"Boot options (in HEX):\n\n"); ShellPrint (L"Boot options (in HEX):\n\n");
@ -367,6 +368,15 @@ PrintBootOption (
); );
} }
for (ExtraIndex = 1; ExtraIndex < LoadImageTypeMax; ExtraIndex++) {
if (BootOption->Image[ExtraIndex].LbaImage.Valid == 1) {
ShellPrint (L" [%x|0x%x]", BootOption->Image[ExtraIndex].LbaImage.SwPart, \
BootOption->Image[ExtraIndex].LbaImage.LbaAddr);
} else if (BootOption->Image[ExtraIndex].FileName[0] != '\0') {
ShellPrint (L" [%a]", BootOption->Image[ExtraIndex].FileName);
}
}
if (Index == OsBootOptionList->CurrentBoot) { if (Index == OsBootOptionList->CurrentBoot) {
ShellPrint (L" *Current"); ShellPrint (L" *Current");
} }

8
Platform/CommonBoardPkg/Library/BoardSupportLib/BoardSupportLib.c
View File

@ -33,6 +33,7 @@ FillBootOptionListFromCfgData (
{ {
OS_BOOT_OPTION *BootOption; OS_BOOT_OPTION *BootOption;
OS_BOOT_OPTION *BootOptionCfgData; OS_BOOT_OPTION *BootOptionCfgData;
UINT8 PrevBootOptionIndex;
UINT8 UpdateFlag; UINT8 UpdateFlag;
UINTN ImageIdx; UINTN ImageIdx;
UINTN Idx; UINTN Idx;
@ -40,8 +41,9 @@ FillBootOptionListFromCfgData (
CHAR8 *StrPtr; CHAR8 *StrPtr;
ImageIdx = 1; ImageIdx = 1;
BootOption = &OsBootOptionList->OsBootOption[0];
OsBootOptionList->CurrentBoot = 0; OsBootOptionList->CurrentBoot = 0;
OsBootOptionList->OsBootOptionCount = 0;
PrevBootOptionIndex = 0;
for (Idx = 0; Idx < MAX_BOOT_OPTION_CFGDATA_ENTRY; Idx++) { for (Idx = 0; Idx < MAX_BOOT_OPTION_CFGDATA_ENTRY; Idx++) {
BootOptionCfgData = (OS_BOOT_OPTION *)FindConfigDataByTag (CDATA_BOOT_OPTION_TAG + Idx); BootOptionCfgData = (OS_BOOT_OPTION *)FindConfigDataByTag (CDATA_BOOT_OPTION_TAG + Idx);
if (BootOptionCfgData == NULL) { if (BootOptionCfgData == NULL) {
@ -57,12 +59,14 @@ FillBootOptionListFromCfgData (
// This entry is an addendum for previous boot option entry // This entry is an addendum for previous boot option entry
if (ImageIdx < ARRAY_SIZE(BootOption->Image)) { if (ImageIdx < ARRAY_SIZE(BootOption->Image)) {
UpdateFlag = 2; UpdateFlag = 2;
BootOption = &OsBootOptionList->OsBootOption[PrevBootOptionIndex];
} }
} else { } else {
// CFGDATA has short structure to save size on flash // CFGDATA has short structure to save size on flash
// Need to translate the short format to OS_BOOT_OPTION format // Need to translate the short format to OS_BOOT_OPTION format
UpdateFlag = 1; UpdateFlag = 1;
ImageIdx = 0; ImageIdx = 0;
BootOption = &OsBootOptionList->OsBootOption[OsBootOptionList->OsBootOptionCount];
CopyMem (BootOption, BootOptionCfgData, OFFSET_OF (OS_BOOT_OPTION, Image[0])); CopyMem (BootOption, BootOptionCfgData, OFFSET_OF (OS_BOOT_OPTION, Image[0]));
} }
@ -80,7 +84,7 @@ FillBootOptionListFromCfgData (
sizeof (BootOption->Image[ImageIdx].FileName)); sizeof (BootOption->Image[ImageIdx].FileName));
} }
if (UpdateFlag == 1) { if (UpdateFlag == 1) {
BootOption++; PrevBootOptionIndex = OsBootOptionList->OsBootOptionCount;
OsBootOptionList->OsBootOptionCount++; OsBootOptionList->OsBootOptionCount++;
if (OsBootOptionList->OsBootOptionCount >= PcdGet32 (PcdOsBootOptionNumber)) { if (OsBootOptionList->OsBootOptionCount >= PcdGet32 (PcdOsBootOptionNumber)) {
break; break;