From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.groups.io with SMTP id smtpd.web10.15240.1583160155774980989 for ; Mon, 02 Mar 2020 06:42:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=kCNs+SHj; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.221.53, mailfrom: pete@akeo.ie) Received: by mail-wr1-f53.google.com with SMTP id n7so5007665wrt.11 for ; Mon, 02 Mar 2020 06:42:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QK+uEFG0Pe7FaVjMczEd+tLyAnS6DICgoHLsHYXbvyI=; b=kCNs+SHjeC2uu3pZvW8qcW9CwhOnamrFLrIqyc5AnaWx8kRVpV7JpU7wGDIYo4PjkS jU5DDSve4L3K0WvQviOr6cUgSDCvJvDT/wQ9pknlVQnOpFlpOTakZmDZ8lO3GRsfcPjH WBxxyc43fDHpgWRCBblNRQvzk+6rEHtup8uXAi+8kV/fukEDKXkJvLUn2pwg8nVc7uFt Mj7MxUdEDS2AXvSpPrD4jD/2ypWE0S8JjmDYPemnYs8wXwrqZM2dejPHUFfzAMGI3qWW mm9s22xS71oFOiwzd0aa+EJRSKg6UzDBz266DKFrH1v5p5bv5u4sgbNV5dyIM398D0kb VaGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QK+uEFG0Pe7FaVjMczEd+tLyAnS6DICgoHLsHYXbvyI=; b=A6MV3nBA83V2IpiaFskICBxRmYAnJ1MwxprFbd26Sr0QGHWt2MPJjWxXq7VmzTCKiZ 23Bcm50EiE862T8UTX1IKnYx+oB87Fii/jnZ1KSJ6UHbuSiy9eGxAiVHs2sqJnFRRI2B mA/IB0jWR2xxKRd5tWvm6+bWZRcOK1evMtYrDVKanSpXzenMTbJm04ZeEdFnIOMsxzS1 EaymrOvHv5sRBe6dUrVYHaG94JXqlNd2GAVtnQOxU6GhG/fQsQRy6bGv1bidNZOG33Xg PJmbQo7xzBn9wZMfVAFrR4tA0j75OcWnnhyBwv2VF3Z8CwiPg59w6iLaKPhtrdzmJ1R3 RlSw== X-Gm-Message-State: APjAAAXi3QaSL+FDbbiZjQXF7Lme6grNp8b1WEIKh3X6JVWljEPkKxnv AeKGZcDZy1TR477u6NyF8teJ4g/Sbog= X-Google-Smtp-Source: APXvYqy8XGwM1lokcGmCWEqblAFw0ZPotW5O4cFRRGSqY0X041xIrYGYErGBq+vePeuuXcowbj2B9A== X-Received: by 2002:adf:e98f:: with SMTP id h15mr19313240wrm.263.1583160153994; Mon, 02 Mar 2020 06:42:33 -0800 (PST) Return-Path: Received: from localhost.localdomain ([84.203.56.244]) by smtp.gmail.com with ESMTPSA id h10sm16366125wml.18.2020.03.02.06.42.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Mar 2020 06:42:33 -0800 (PST) From: "Pete Batard" To: devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org, leif@nuviainc.com, awarkentin@vmware.com Subject: [edk2-devel][RESEND][PATCH 2/2] Platform/RPi4/Library/PlatformBootManagerLib: remove dead logo code Date: Mon, 2 Mar 2020 14:42:19 +0000 Message-Id: <20200302144219.10452-3-pete@akeo.ie> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20200302144219.10452-1-pete@akeo.ie> References: <20200302144219.10452-1-pete@akeo.ie> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Andrei Warkentin Back in RaspberryPiPkg (before upstream Pi 3) support, I wrote some extra code in PlatformBootManagerLib and BootGraphicsResourceTableDxe to clear out the logo/BGRT, so that Windows would always show its own logo instead of the platform logo. It kind of made sense back in the day, when they only portion of Windows that "ran" on Pi 3 was the part that could display a logo before BSODing... The code in PlatformBootManagerLib (that this patch is removing) only worked with the matching BootGraphicsResourceTableDxe change*** that never got upstreamed. Moreover, Windows (for logo/cert) requires BGRT so these kinds of shennigans aren't worth the effort. So, remove the dead code. ***https://github.com/andreiw/RaspberryPiPkg/blob/master/edk2Patches/0003-BootGraphicsResourceTableDxe-properly-handle-SetBoot.patch Signed-off-by: Andrei Warkentin --- Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c | 18 ------------------ Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 1 - 2 files changed, 19 deletions(-) diff --git a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c index 12c3829d28f5..996ba8f39938 100644 --- a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c +++ b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c @@ -25,7 +25,6 @@ #include #include #include -#include #include "PlatformBm.h" @@ -691,7 +690,6 @@ PlatformBootManagerWaitCallback ( EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION White; UINT16 Timeout; EFI_STATUS Status; - EFI_BOOT_LOGO_PROTOCOL *BootLogo; Timeout = PcdGet16 (PcdPlatformBootTimeOut); @@ -711,22 +709,6 @@ PlatformBootManagerWaitCallback ( } else { Print (L"."); } - - if (TimeoutRemain == 0) { - BootLogo = NULL; - - // - // Clear out the boot logo so that Windows displays its own logo - // instead of ours. - // - Status = gBS->LocateProtocol (&gEfiBootLogoProtocolGuid, NULL, (VOID**)&BootLogo); - if (!EFI_ERROR (Status) && (BootLogo != NULL)) { - Status = BootLogo->SetBootLogo (BootLogo, NULL, 0, 0, 0, 0); - ASSERT_EFI_ERROR (Status); - }; - - gST->ConOut->ClearScreen (gST->ConOut); - } } /** diff --git a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index 79b75d667f55..e40b3f096a4f 100644 --- a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -81,4 +81,3 @@ [Protocols] gEfiSimpleFileSystemProtocolGuid gEsrtManagementProtocolGuid gEfiUsb2HcProtocolGuid - gEfiBootLogoProtocolGuid -- 2.21.0.windows.1