diff options
| author | Guo, Mang <mang.guo@intel.com> | 2017-03-07 20:40:08 +0800 |
|---|---|---|
| committer | Guo Mang <mang.guo@intel.com> | 2017-03-09 09:58:48 +0800 |
| commit | a77915041649aa196582c15021f7eabf6ab616df (patch) | |
| tree | 1231a8ecf8ef5777d9e0436e23cded7a0a86f3af /Platform | |
| parent | 46d395e24e134ff5fc994f5eee1960a85921febc (diff) | |
| download | edk2-platforms-a77915041649aa196582c15021f7eabf6ab616df.tar.xz | |
Fix Graphic issue
Fix Graphic driver not connect issue when boot to OS if fastboot enable.
Set network default disable.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Guo Mang <mang.guo@intel.com>
Reviewed-by: david.wei@intel.com
Diffstat (limited to 'Platform')
3 files changed, 10 insertions, 9 deletions
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/BdsPlatform.c b/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/BdsPlatform.c index af887e4cc9..53a5ee7e2f 100644 --- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/BdsPlatform.c +++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/BdsPlatform.c @@ -1858,7 +1858,7 @@ ShowProgressHotKey ( while (TimeoutRemain != 0) {
DEBUG ((EFI_D_INFO, "Showing progress bar...Remaining %d second!\n", TimeoutRemain));
- Status = WaitForSingleEvent (gST->ConIn->WaitForKey, ONE_SECOND);
+ Status = WaitForSingleEvent (gST->ConIn->WaitForKey, ONE_SECOND/10);
if (Status != EFI_TIMEOUT) {
break;
}
@@ -2186,11 +2186,6 @@ PlatformBdsConnectSimpleConsole ( if ((PlatformConsole[Index].ConnectType & CONSOLE_OUT) == CONSOLE_OUT) {
BdsLibUpdateConsoleVariable (L"ConOut", PlatformConsole[Index].DevicePath, NULL);
- //
- // Make sure we have at least one active VGA, and have the right
- // active VGA in console variable
- //
- Status = PlatformBdsForceActiveVga ();
}
if ((PlatformConsole[Index].ConnectType & STD_ERROR) == STD_ERROR) {
@@ -2202,6 +2197,12 @@ PlatformBdsConnectSimpleConsole ( }
//
+ // Make sure we have at least one active VGA, and have the right
+ // active VGA in console variable
+ //
+ Status = PlatformBdsForceActiveVga ();
+
+ //
// Connect ConIn first to give keyboard time to parse hot key event.
//
Status = BdsLibConnectConsoleVariable (L"ConIn");
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Boot.vfi b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Boot.vfi index ad57c250e9..9d842698f1 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Boot.vfi +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Boot.vfi @@ -77,8 +77,8 @@ form formid = BOOT_CONFIGURATION_FORM_ID, oneof varid = Setup.EfiNetworkSupport,
prompt = STRING_TOKEN(STR_EFI_NETWORK_CONTROL),
help = STRING_TOKEN(STR_EFI_NETWORK_CONTROL_HELP),
- option text = STRING_TOKEN(STR_DISABLED), value = 0, flags = RESET_REQUIRED;
- option text = STRING_TOKEN(STR_ENABLED), value = 1, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;
+ option text = STRING_TOKEN(STR_DISABLED), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;
+ option text = STRING_TOKEN(STR_ENABLED), value = 1, flags = 0 | RESET_REQUIRED;
endoneof;
oneof varid = Setup.RTEn,
diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsDynamicHii.Default.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsDynamicHii.Default.dsc index 3242aa3ee7..96e27eedad 100644 --- a/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsDynamicHii.Default.dsc +++ b/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsDynamicHii.Default.dsc @@ -13,7 +13,7 @@ #
##
- gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 # Variable: L"Timeout"
+ gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"Timeout"
gClientCommonModuleTokenSpaceGuid.PcdPlatformMemoryCheck|L"MemoryCheck"|gClientCommonModuleTokenSpaceGuid|0x0|0
gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport"
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState"|gEfiBootStateGuid|0x0|TRUE
|