From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web12.5382.1642726681430622846 for ; Thu, 20 Jan 2022 16:58:03 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=HGtXq7gw; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: guomin.jiang@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642726682; x=1674262682; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4LhkjJlokmcgIzAYHQGbzPWJ0Mk8yGHn0V5xAGtz3Ng=; b=HGtXq7gwmx0PU7jWsSUVbYt3Cg+l+kj9D60ofoGgS9AS851+DHLazUBT SdinSAXGZwauVDPeQC7o1ob9uwZbXLyxApSCFCX1Z4haatitiFWYryKE/ PpNppk4L3NWa8vz1uNWR6FGNruGnOGCJIhwaGZ3EW+lhJiQr28zTrTPMp nkf8ynRnOcbk2yoCLjXPwl7ylAQuYeULwkMQmN58vRAhZrMz+bPTrV2Ca WojklYKOPMOHONrcYm9HpjVzjerY11qUyGcGgdh3imSLh8D48Kazv7BNP afVsymuxG12b6GXpj12QwE0SOqERu/V+8gYe8m+WJEvwuWylameIKy8Nw A==; X-IronPort-AV: E=McAfee;i="6200,9189,10233"; a="306256162" X-IronPort-AV: E=Sophos;i="5.88,303,1635231600"; d="scan'208";a="306256162" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2022 16:58:02 -0800 X-IronPort-AV: E=Sophos;i="5.88,303,1635231600"; d="scan'208";a="475756130" Received: from guominji-mobl.ccr.corp.intel.com ([10.238.9.87]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2022 16:58:00 -0800 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Nate DeSimone , Guomin Jiang Subject: [ed2-platforms][PATCH 1/2] Platform/Intel/SimicsOpenBoardPkg: Remove all UGA support Date: Fri, 21 Jan 2022 08:56:32 +0800 Message-Id: <20220121005633.1018-2-guomin.jiang@intel.com> X-Mailer: git-send-email 2.30.0.windows.2 In-Reply-To: <20220121005633.1018-1-guomin.jiang@intel.com> References: <20220121005633.1018-1-guomin.jiang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: GuoMinJ REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2368 Cc: Nate DeSimone Signed-off-by: Guomin Jiang --- .../BoardX58Ich10/OpenBoardPkgPcd.dsc | 4 +- .../Library/DxeLogoLib/DxeLogoLib.inf | 6 +-- .../Library/DxeLogoLib/Logo.c | 45 +------------------ 3 files changed, 3 insertions(+), 52 deletions(-) diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc index 88009b8f1022..9b81726623dc 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc @@ -1,7 +1,7 @@ ## @file # PCD configuration build description file for the X58Ich10 board. # -# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
+# Copyright (c) 2019 - 2022, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -31,8 +31,6 @@ [PcdsFeatureFlag.common] # Edk2 Configuration ###################################### 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..cd9565e123db 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/DxeLogoLib.inf +++ b/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/DxeLogoLib.inf @@ -6,7 +6,7 @@ # 2) BDS boot device connect interface; # 3) BDS Misc interfaces for mainting boot variable, ouput string, etc. # -# Copyright (c) 2007 - 2019 Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2022 Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -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..9cea5f4665d0 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/Logo.c +++ b/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/Logo.c @@ -1,7 +1,7 @@ /** @file BDS Lib functions which contain all the code to connect console device - Copyright (c) 2006 - 2019 Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2022 Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -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; } -- 2.30.0.windows.2