diff options
Diffstat (limited to 'IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c')
| -rw-r--r-- | IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c b/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c index 09d1bc1ea5..410d4f1db6 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c @@ -346,30 +346,32 @@ BdsMemoryTest ( DEBUG ((EFI_D_INFO, "Perform memory test (ESC to skip).\n"));
}
- KeyStatus = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
- if (!EFI_ERROR (KeyStatus) && (Key.ScanCode == SCAN_ESC)) {
- if (!RequireSoftECCInit) {
- if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) {
- TmpStr = GetStringById (STRING_TOKEN (STR_PERFORM_MEM_TEST));
- if (TmpStr != NULL) {
- PlatformBdsShowProgress (
- Foreground,
- Background,
- TmpStr,
- Color,
- 100,
- (UINTN) PreviousValue
- );
- FreePool (TmpStr);
+ if (!PcdGetBool (PcdConInConnectOnDemand)) {
+ KeyStatus = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
+ if (!EFI_ERROR (KeyStatus) && (Key.ScanCode == SCAN_ESC)) {
+ if (!RequireSoftECCInit) {
+ if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) {
+ TmpStr = GetStringById (STRING_TOKEN (STR_PERFORM_MEM_TEST));
+ if (TmpStr != NULL) {
+ PlatformBdsShowProgress (
+ Foreground,
+ Background,
+ TmpStr,
+ Color,
+ 100,
+ (UINTN) PreviousValue
+ );
+ FreePool (TmpStr);
+ }
+
+ PrintXY (10, 10, NULL, NULL, L"100");
}
-
- PrintXY (10, 10, NULL, NULL, L"100");
+ Status = GenMemoryTest->Finished (GenMemoryTest);
+ goto Done;
}
- Status = GenMemoryTest->Finished (GenMemoryTest);
- goto Done;
- }
- TestAbort = TRUE;
+ TestAbort = TRUE;
+ }
}
} while (Status != EFI_NOT_FOUND);
|