From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.groups.io with SMTP id smtpd.web09.15256.1583160553022687042 for ; Mon, 02 Mar 2020 06:49:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=e62LC1BI; spf=pass (domain: linaro.org, ip: 209.85.128.65, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f65.google.com with SMTP id f15so11509543wml.3 for ; Mon, 02 Mar 2020 06:49:12 -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=9QDMbRBxdwC7iwVtCrBfYpi16E8bGzZrZbZc47I0dZI=; b=e62LC1BIM3hBWUIWAOJkHk6IMswnTZxcjGqe3DdxYTozGSyt79GB8oWDWe4IU+hNGG 5sWyEDA1n7mTAZcENVzgbgtxgYTOCsEwwWq0VXhlVDuMRwqhHgzGOLTsnTZFsyqk48ax 1D6gcppRpd8aLJA6rOUovHYb9GXg5g+UPDvmXlaUtpFtLisDMtRtN1ApZKmmqODvJFs5 2HnzjAl4raqgEHNMhN2CYk68yCs7LRGEyBAzsuOicRdRv22mTJuyL2np96m3Za5wpmoh TvMdmE1DlwOsvShMdCGeryA6k2NdVNSktLVjks1s2nUIChKLPjHa0bX1mOc3YGfSZxN4 N8Yw== 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=9QDMbRBxdwC7iwVtCrBfYpi16E8bGzZrZbZc47I0dZI=; b=F5OI9QGvZ8FJ29iGunha6hrhGoKqZiNmvapg9q630VGm9u9sISocwbKL06ydBFGmd1 8brumgV3TzqFTgEhLqUDFx/ATsfjlDWLBPA/dhdgLif4+jkAjheXtBibQXMO09T/fVD0 LZMwzM5TfCvJmbndtELyNEx6q7hacLye7HgMiflzHqUfxINEwphzSPXLU0X0ijUD3gNI 2mm8NvCTlefbYqzAazZ0o4x+Ifjd4ucqCy3x0zfgCf2x5TrU8ELZXupG+T3LiXeBXbl/ 7UZ3vqwxaE79WO+dgnDFV1qJBcN7SdvkIfARDHJFICjf7E/Ub9uZOyr5UQIE180nmGZb YlAg== X-Gm-Message-State: APjAAAWeOsZyQ4wgyVczAI/KqV9HqLjJY9ORtRSu/F4cfuDT2qYzhG8U wOcG0g9H6MGnbMW5bapIlzSHbN/EdqencmWD6xctRg== X-Google-Smtp-Source: APXvYqwTKm28nqWCxDEeTD31BfFqpM4DeIYOY6Z1M3uQVmj9OBXc14ZwGTpS+J2eYBc5REyqgIcfD2gnwJIZT5EKyi8= X-Received: by 2002:a1c:bc46:: with SMTP id m67mr19465922wmf.40.1583160551545; Mon, 02 Mar 2020 06:49:11 -0800 (PST) MIME-Version: 1.0 References: <20200302144219.10452-1-pete@akeo.ie> <20200302144219.10452-3-pete@akeo.ie> In-Reply-To: <20200302144219.10452-3-pete@akeo.ie> From: "Ard Biesheuvel" Date: Mon, 2 Mar 2020 15:49:00 +0100 Message-ID: Subject: Re: [edk2-devel][RESEND][PATCH 2/2] Platform/RPi4/Library/PlatformBootManagerLib: remove dead logo code To: Pete Batard Cc: edk2-devel-groups-io , Leif Lindholm , Andrei Warkentin Content-Type: text/plain; charset="UTF-8" On Mon, 2 Mar 2020 at 15:42, Pete Batard wrote: > > 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 Thanks Pushed as f57b439e5610..30324eefb3a4 (with Pete's ack) > --- > 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 >