1. Patchew
  2. EDK2
  3. View series

[edk2] [Patch][edk2-platforms/devel-MinnowBoard3] Fix Graphic issue

Guo, Mang posted 1 patch 7 years, 1 month ago
Failed in applying to current master (apply log)
.../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(-)
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3] Fix Graphic issue
Posted by Guo, Mang 7 years, 1 month ago 
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

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch][edk2-platforms/devel-MinnowBoard3] Fix Graphic issue
Posted by Wei, David 7 years, 1 month ago 
Hi Mang, 

Could you double check below definition change? 

-#define ONE_SECOND  10000000
+#define ONE_SECOND  1000000 


Thanks,
David  Wei                                 


-----Original Message-----
From: Guo, Mang 
Sent: Tuesday, March 07, 2017 8:40 PM
To: 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

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

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch][edk2-platforms/devel-MinnowBoard3] Fix Graphic issue
Posted by Guo, Mang 7 years, 1 month ago 
Thanks David, already fixed this issue.



-----Original Message-----
From: Wei, David 
Sent: Wednesday, March 8, 2017 11:27 AM
To: Guo, Mang; edk2-devel@lists.01.org
Cc: Lu, ShifeiX A; Wei, David
Subject: RE: [Patch][edk2-platforms/devel-MinnowBoard3] Fix Graphic issue

Hi Mang, 

Could you double check below definition change? 

-#define ONE_SECOND  10000000
+#define ONE_SECOND  1000000 


Thanks,
David  Wei                                 


-----Original Message-----
From: Guo, Mang 
Sent: Tuesday, March 07, 2017 8:40 PM
To: 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

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

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.