public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Guo, Mang" <mang.guo@intel.com>
To: "edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Cc: "Wei, David" <david.wei@intel.com>,
	"Lu, ShifeiX A" <shifeix.a.lu@intel.com>
Subject: [Patch][edk2-platforms/devel-MinnowBoard3] Fix Graphic issue
Date: Tue, 7 Mar 2017 12:40:08 +0000	[thread overview]
Message-ID: <22D2C85ED001C54AA20BFE3B0E4751D1524DD9DE@SHSMSX103.ccr.corp.intel.com> (raw)

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>
---
 .../Common/Library/PlatformBdsLib/BdsPlatform.c               | 11 ++++++-----
 .../Common/Library/PlatformBdsLib/BdsPlatform.h               |  2 +-
 .../Common/PlatformSettings/PlatformSetupDxe/Boot.vfi         |  4 ++--
 .../BroxtonPlatformPkg/PlatformDsc/PcdsDynamicHii.Default.dsc |  2 +-
 4 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 af887e4..bde5b11 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/BdsPlatform.c
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/BdsPlatform.c
@@ -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/Library/PlatformBdsLib/BdsPlatform.h b/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/BdsPlatform.h
index 18c5f88..2d649eb 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/BdsPlatform.h
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/BdsPlatform.h
@@ -405,7 +405,7 @@ BdsStartBootMaint (
   VOID
   );
 
-#define ONE_SECOND  10000000
+#define ONE_SECOND  1000000
 #define FRONT_PAGE_KEY_CONTINUE        0x1000
 #define FRONT_PAGE_KEY_LANGUAGE        0x1234
 #define FRONT_PAGE_KEY_BOOT_MANAGER    0x1064
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Boot.vfi b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Boot.vfi
index ad57c25..9d84269 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 3242aa3..96e27ee 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
-- 
2.10.1.windows.1



             reply	other threads:[~2017-03-07 12:40 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-07 12:40 Guo, Mang [this message]
2017-03-08  3:26 ` [Patch][edk2-platforms/devel-MinnowBoard3] Fix Graphic issue Wei, David
2017-03-09  1:45   ` Guo, Mang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=22D2C85ED001C54AA20BFE3B0E4751D1524DD9DE@SHSMSX103.ccr.corp.intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox