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

OsLoader: Print misc image info in Shell 

Add support to print misc image info in shell. Misc image will only be
printed when BOOT_FLAGS_MISC is set.

Also fixes some minor bugs in 5968cfa919 ("OsLoader: Print all extra
images")

Signed-off-by: Jiaqing Zhao <jiaqing.zhao@intel.com>
This commit is contained in:
Jiaqing Zhao 2023-09-19 03:15:12 +00:00 committed by Guo Dong
parent 7b13f02c68
commit 338ba840bf
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -393,7 +393,7 @@ PrintExtraImage (
BootImage = &BootOption->Image[ImageType];
if ((BootOption->BootFlags & Flags) != 0){
if (BootImage->LbaImage.Valid == 1) {
ShellPrint (L" %6a | %4a | %4x | %a\n",
ShellPrint (L" %6a | %4a | %4x | 0x%x\n",
GetLoadedImageTypeNameString(ImageType),
"RAW",
BootImage->LbaImage.SwPart,
@ -460,13 +460,16 @@ PrintBootOption (
}
ShellPrint (L"\n");
//Print Pre-OS image filename
//Print extra image filename
for (UINT8 Type = LoadImageTypeExtra0; Type < LoadImageTypeMax; Type++) {
PrintExtraImage (BootOption, BOOT_FLAGS_EXTRA, Type);
}
//Print extra image filename
//Print Pre-OS image filename
PrintExtraImage (BootOption,BOOT_FLAGS_PREOS,LoadImageTypePreOs);
//Print misc image filename
PrintExtraImage (BootOption,BOOT_FLAGS_MISC,LoadImageTypeMisc);
}
}

9
PayloadPkg/OsLoader/BootOption.c
View File

@ -26,7 +26,7 @@ PrintExtraImages (
BootImage = &BootOption->Image[ImageType];
if ((BootOption->BootFlags & Flags) != 0){
if (BootImage->LbaImage.Valid == 1) {
DEBUG ((DEBUG_INFO, " %6a | %4a | %4x | %a\n",
DEBUG ((DEBUG_INFO, " %6a | %4a | %4x | 0x%x\n",
GetLoadedImageTypeNameString(ImageType),
"RAW",
BootImage->LbaImage.SwPart,
@ -93,13 +93,16 @@ PrintBootOptions (
}
DEBUG ((DEBUG_INFO, "\n"));
//Print Pre-OS image filename
//Print extra image filename
for (UINT8 Type = LoadImageTypeExtra0; Type < LoadImageTypeMax; Type++) {
PrintExtraImages (BootOption, BOOT_FLAGS_EXTRA, Type);
}
//Print extra image filename
//Print Pre-OS image filename
PrintExtraImages (BootOption,BOOT_FLAGS_PREOS,LoadImageTypePreOs);
//Print misc image filename
PrintExtraImages (BootOption,BOOT_FLAGS_MISC,LoadImageTypeMisc);
}
}