* [edk2-platforms][PATCH] 1/3] Platform/Intel: Remove All UGA Support
2020-05-08 9:16 [edk2-platforms][PATCH] 0/3] Remove All UGA Support Guomin Jiang
@ 2020-05-08 9:16 ` Guomin Jiang
2020-05-08 9:16 ` [edk2-platforms][PATCH] 2/3] Platform/Intel/SimicsOpenBoardPkg: Fix build error Guomin Jiang
2020-05-08 9:16 ` [edk2-platforms][PATCH] 3/3] Platform/Intel: Remove All UGA Support Guomin Jiang
2 siblings, 0 replies; 4+ messages in thread
From: Guomin Jiang @ 2020-05-08 9:16 UTC (permalink / raw)
To: devel; +Cc: GuoMinJ, Agyeman Prince, Zailiang Sun, Yi Qian, Guomin Jiang
From: GuoMinJ <newexplorerj@gmail.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2368
Remove all UGA Support in INTEL platform.
Cc: Agyeman Prince <prince.agyeman@intel.com>
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Signed-off-by: Guomin Jiang <guomin.jiang@intel.com>
---
.../BoardX58Ich10/OpenBoardPkgPcd.dsc | 1 -
.../Library/DxeLogoLib/DxeLogoLib.inf | 4 --
.../Library/DxeLogoLib/Logo.c | 43 -------------------
.../DxePlatformBootManagerLib/BdsPlatform.h | 1 -
4 files changed, 49 deletions(-)
diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc
index cd98d09f0187..5c778d5d08d2 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc
@@ -32,7 +32,6 @@ [PcdsFeatureFlag.common]
######################################
gEfiMdeModulePkgTokenSpaceGuid.PcdBrowerGrayOutReadOnlyMenu|TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE
- gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/DxeLogoLib.inf b/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/DxeLogoLib.inf
index ff08c385b3a0..66a102acdd60 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/DxeLogoLib.inf
+++ b/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/DxeLogoLib.inf
@@ -41,15 +41,11 @@ [Packages]
MdeModulePkg/MdeModulePkg.dec
SimicsOpenBoardPkg/OpenBoardPkg.dec
-[FeaturePcd]
- gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport
-
[Sources]
Logo.c
[Protocols]
gEfiGraphicsOutputProtocolGuid ## SOMETIMES_CONSUMES
- gEfiUgaDrawProtocolGuid ## SOMETIMES_CONSUMES
gEfiBootLogoProtocolGuid ## SOMETIMES_CONSUMES
gEfiUserManagerProtocolGuid ## CONSUMES
gEfiOemBadgingProtocolGuid ## CONSUMES
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/Logo.c b/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/Logo.c
index 48a718a90d46..6a98ccfb8a74 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/Logo.c
+++ b/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/Logo.c
@@ -10,7 +10,6 @@
#include <Protocol/SimpleTextOut.h>
#include <OemBadging.h>
#include <Protocol/GraphicsOutput.h>
-#include <Protocol/UgaDraw.h>
#include <Library/BaseLib.h>
#include <Library/UefiLib.h>
#include <Library/BaseMemoryLib.h>
@@ -300,9 +299,6 @@ EnableBootLogo (
UINTN Height;
UINTN Width;
EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Blt;
- EFI_UGA_DRAW_PROTOCOL *UgaDraw;
- UINT32 ColorDepth;
- UINT32 RefreshRate;
EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput;
EFI_BOOT_LOGO_PROTOCOL *BootLogo;
UINTN NumberOfLogos;
@@ -317,18 +313,10 @@ EnableBootLogo (
UINTN NewWidth;
UINT64 BufferSize;
- UgaDraw = NULL;
//
// Try to open GOP first
//
Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiGraphicsOutputProtocolGuid, (VOID **) &GraphicsOutput);
- if (EFI_ERROR (Status) && FeaturePcdGet (PcdUgaConsumeSupport)) {
- GraphicsOutput = NULL;
- //
- // Open GOP failed, try to open UGA
- //
- Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiUgaDrawProtocolGuid, (VOID **) &UgaDraw);
- }
if (EFI_ERROR (Status)) {
return EFI_UNSUPPORTED;
}
@@ -351,11 +339,6 @@ EnableBootLogo (
SizeOfX = GraphicsOutput->Mode->Info->HorizontalResolution;
SizeOfY = GraphicsOutput->Mode->Info->VerticalResolution;
- } else if (UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) {
- Status = UgaDraw->GetMode (UgaDraw, &SizeOfX, &SizeOfY, &ColorDepth, &RefreshRate);
- if (EFI_ERROR (Status)) {
- return EFI_UNSUPPORTED;
- }
} else {
return EFI_UNSUPPORTED;
}
@@ -503,19 +486,6 @@ EnableBootLogo (
Height,
Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)
);
- } else if (UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) {
- Status = UgaDraw->Blt (
- UgaDraw,
- (EFI_UGA_PIXEL *) Blt,
- EfiUgaBltBufferToVideo,
- 0,
- 0,
- (UINTN) DestX,
- (UINTN) DestY,
- Width,
- Height,
- Width * sizeof (EFI_UGA_PIXEL)
- );
} else {
Status = EFI_UNSUPPORTED;
}
@@ -620,19 +590,6 @@ EnableBootLogo (
LogoHeight,
LogoWidth * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)
);
- } else if (UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) {
- Status = UgaDraw->Blt (
- UgaDraw,
- (EFI_UGA_PIXEL *) LogoBlt,
- EfiUgaVideoToBltBuffer,
- LogoDestX,
- LogoDestY,
- 0,
- 0,
- LogoWidth,
- LogoHeight,
- LogoWidth * sizeof (EFI_UGA_PIXEL)
- );
} else {
Status = EFI_UNSUPPORTED;
}
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/BdsPlatform.h b/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/BdsPlatform.h
index 0bdc11bdd824..6cc4e3acf279 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/BdsPlatform.h
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/BdsPlatform.h
@@ -19,7 +19,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include <Protocol/LoadedImage.h>
#include <Protocol/DiskInfo.h>
#include <Protocol/GraphicsOutput.h>
-#include <Protocol/UgaDraw.h>
#include <Protocol/GenericMemoryTest.h>
#include <Protocol/DevicePathToText.h>
#include <Protocol/FirmwareVolume2.h>
--
2.25.1.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [edk2-platforms][PATCH] 2/3] Platform/Intel/SimicsOpenBoardPkg: Fix build error.
2020-05-08 9:16 [edk2-platforms][PATCH] 0/3] Remove All UGA Support Guomin Jiang
2020-05-08 9:16 ` [edk2-platforms][PATCH] 1/3] Platform/Intel: " Guomin Jiang
@ 2020-05-08 9:16 ` Guomin Jiang
2020-05-08 9:16 ` [edk2-platforms][PATCH] 3/3] Platform/Intel: Remove All UGA Support Guomin Jiang
2 siblings, 0 replies; 4+ messages in thread
From: Guomin Jiang @ 2020-05-08 9:16 UTC (permalink / raw)
To: devel; +Cc: GuoMinJ, Agyeman Prince, Guomin Jiang
From: GuoMinJ <newexplorerj@gmail.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2368
It seem that the '=' expression is unallowed and the value should be
hex.
Cc: Agyeman Prince <prince.agyeman@intel.com>
Signed-off-by: Guomin Jiang <guomin.jiang@intel.com>
---
Platform/Intel/SimicsOpenBoardPkg/AcpiTables/Dsdt.asl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Platform/Intel/SimicsOpenBoardPkg/AcpiTables/Dsdt.asl b/Platform/Intel/SimicsOpenBoardPkg/AcpiTables/Dsdt.asl
index 8a6c3792ba66..43960e3dd524 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/AcpiTables/Dsdt.asl
+++ b/Platform/Intel/SimicsOpenBoardPkg/AcpiTables/Dsdt.asl
@@ -17,7 +17,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 1, "INTEL ", "SIMICS ", 4) {
Name (GPIC, Zero)
Method (_PIC, 1, NotSerialized) // _PIC: Interrupt Model
{
- GPIC = Arg0
+ Store(Arg0, GPIC)
}
//
// System Bus
@@ -372,7 +372,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 1, "INTEL ", "SIMICS ", 4) {
Package () {0x000EFFFF, 0x00, 0, 16},
Package () {0x000EFFFF, 0x01, 0, 17},
- Package () {0x000EFFFF, 0x02, 0C, 18},
+ Package () {0x000EFFFF, 0x02, 0x0C, 18},
Package () {0x000EFFFF, 0x03, 0, 19},
Package () {0x000FFFFF, 0x00, 0, 16},
--
2.25.1.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread