From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mx.groups.io with SMTP id smtpd.web09.14887.1583158952417520167 for ; Mon, 02 Mar 2020 06:22:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=RcFFu1wZ; spf=pass (domain: linaro.org, ip: 209.85.128.67, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f67.google.com with SMTP id f15so11402219wml.3 for ; Mon, 02 Mar 2020 06:22:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=dxZl1gLFXxErqXOHhVHtjwl4xKuUOguEMFDiTdDwWhE=; b=RcFFu1wZ5ci+0m2TyspTiJtF40DcYamaALOQgfwYR/7j3VIWQ5caMlaEuUCtTM8nkR F98Cn9XNVXCWIq3W3l5vhGsZb8SgyUq3u2Kem6WnDlbUPHfkLg3MLHEhD1yf8ZhHHbcz LAwOnCbiWUwi/xFHQZDj+N4c1pU/AasHL1BXB8uByCbgs9l8A6apfTCn1J6Y4FzhKQp2 K3I+/diOO8Mg2e5sU3qprH1P6cY73V/vRUBbMq6lGkFN4JQmBHuzfTHLXDSwTn1uTH2O IsWgmSLUBjqqoon/nGjbbh/KR9oLmFZA/LSoeER1skXl9wUEKkto1Y9tEExy7X7jjLo1 MHnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=dxZl1gLFXxErqXOHhVHtjwl4xKuUOguEMFDiTdDwWhE=; b=ClwvjMNsB8MI6LZup8sCBLcDxHYmb66m7c8epzSKU9A/IHOOXOEf5HmMA3IFp1wNpS kbJsEe0ZpeBDDAbAV4CnASAKhbum68dwBqddqf1kDxwLjy0ki9+8Xc4F7nO1YjMPqsyB fdMO5ecHROLp85lbchVUTY43VFLuColoebAV7SevTiVVamj4hVsKS1DTvYZWkzaDuIT0 iOZf6omzoFzO9HDQ99YiMGrSd5kvbBuarN2oqPB6k7OBEPHxzi41hsKGayTxqw1uYdHG bmo36g8/maKYopiLLzcy9c6H+LuIwnGqR/k7Fsuv6a7P+Mj71L3uZ8HRIbIx9MZRW8sS 42tQ== X-Gm-Message-State: APjAAAW4vFX009Zn/x4WAHsEntMiiTZs161WFcKu/GpjZh5+jKzyxfa9 rqIjungi8ihWrMhWBmQjQchRvR7OGgYkKLmV9qZTljqW2BM= X-Google-Smtp-Source: APXvYqyEIqxJW71pmPd+Oi5TJhvuw+o5RQT+BDiTTlSF7sFcNFjhOwwVyNa+Lfv0fDKv43zdA5SMU+dyW166IR2F85c= X-Received: by 2002:a1c:9d43:: with SMTP id g64mr19362322wme.62.1583158950520; Mon, 02 Mar 2020 06:22:30 -0800 (PST) MIME-Version: 1.0 References: <20200302030809.48143-1-awarkentin@vmware.com> In-Reply-To: From: "Ard Biesheuvel" Date: Mon, 2 Mar 2020 15:22:19 +0100 Message-ID: Subject: Re: [edk2-devel] [PATCH] Platform/RPi4/Library/PlatformBootManagerLib: remove dead logo code To: edk2-devel-groups-io , Pete Batard Cc: Andrei Warkentin Content-Type: text/plain; charset="UTF-8" On Mon, 2 Mar 2020 at 14:09, Pete Batard wrote: > > On 2020.03.02 03:08, Andrei Warkentin via Groups.Io wrote: > > 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 > > --- > > .../PlatformBootManagerLib/PlatformBm.c | 18 ------------------ > > .../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 12c3829d28..996ba8f399 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 79b75d667f..e40b3f096a 100644 > > --- a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > > +++ b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > > @@ -81,4 +81,3 @@ > > gEfiSimpleFileSystemProtocolGuid > > gEsrtManagementProtocolGuid > > gEfiUsb2HcProtocolGuid > > - gEfiBootLogoProtocolGuid > > > > Reviewed-By & Tested-By: Pete Batard > Thanks Pete This patch does not apply though. Could someone send a non-email mangled version that applies onto edk2-platforms? Thanks.