tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/BdsDxe: Revert "fall back to UI loop before hanging" 

Commit d1de487dd2
"MdeModulePkg/BdsDxe: fall back to a Boot Manager Menu loop before
 hanging"
changed BDS core to fall back to UI loop when no bootable option
can be launched.
Now since PlatformBootManagerUnableToBoot() is added, the commit
can be reverted.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Ruiyu Ni 2018-07-03 14:16:45 +08:00
parent 8d1b281af3
commit f50db933c5
1 changed files with 4 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
MdeModulePkg/Universal/BdsDxe/BdsEntry.c
View File

@ -634,55 +634,6 @@ BdsFormalizeEfiGlobalVariable (
BdsFormalizeOSIndicationVariable ();
}
/**
Enter an infinite loop of calling the Boot Manager Menu.
This is a last resort alternative to BdsEntry() giving up for good. This
function never returns.
@param[in] BootManagerMenu The EFI_BOOT_MANAGER_LOAD_OPTION located and/or
created by the EfiBootManagerGetBootManagerMenu()
call in BdsEntry().
**/
VOID
BdsBootManagerMenuLoop (
IN EFI_BOOT_MANAGER_LOAD_OPTION *BootManagerMenu
)
{
EFI_INPUT_KEY Key;
//
// Normally BdsDxe does not print anything to the system console, but this is
// a last resort -- the end-user will likely not see any DEBUG messages
// logged in this situation.
//
// AsciiPrint() will NULL-check gST->ConOut internally. We check gST->ConIn
// here to see if it makes sense to request and wait for a keypress.
//
if (gST->ConIn != NULL) {
AsciiPrint (
"%a: No bootable option or device was found.\n"
"%a: Press any key to enter the Boot Manager Menu.\n",
gEfiCallerBaseName,
gEfiCallerBaseName
);
BdsWaitForSingleEvent (gST->ConIn->WaitForKey, 0);
//
// Drain any queued keys.
//
while (!EFI_ERROR (gST->ConIn->ReadKeyStroke (gST->ConIn, &Key))) {
//
// just throw away Key
//
}
}
for (;;) {
EfiBootManagerBoot (BootManagerMenu);
}
}
/**
Service routine for BdsInstance->Entry(). Devices are connected, the
@ -1081,19 +1032,16 @@ BdsEntry (
} while (BootSuccess);
}
if (BootManagerMenuStatus != EFI_NOT_FOUND) {
EfiBootManagerFreeLoadOption (&BootManagerMenu);
}
if (!BootSuccess) {
LoadOptions = EfiBootManagerGetLoadOptions (&LoadOptionCount, LoadOptionTypePlatformRecovery);
ProcessLoadOptions (LoadOptions, LoadOptionCount);
EfiBootManagerFreeLoadOptions (LoadOptions, LoadOptionCount);
}
//
// If BootManagerMenu is available, fall back to it indefinitely.
//
if (BootManagerMenuStatus != EFI_NOT_FOUND) {
BdsBootManagerMenuLoop (&BootManagerMenu);
}
DEBUG ((EFI_D_ERROR, "[Bds] Unable to boot!\n"));
CpuDeadLoop ();
}