From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.groups.io with SMTP id smtpd.web11.15119.1583160231671015414 for ; Mon, 02 Mar 2020 06:43:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=KGuafU8l; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.221.65, mailfrom: pete@akeo.ie) Received: by mail-wr1-f65.google.com with SMTP id t11so6514938wrw.5 for ; Mon, 02 Mar 2020 06:43:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=t/iDf/08Hqnh7qlw7Jy7UKvuU3HIY5xYgp06B4uY4To=; b=KGuafU8lO680eln2KI8ygXqr+7/bXfZ1qfY+AePtaR974qZwXIAjMXwI4imsFtvrtG wg+Q934wILC2AHuXPf26Nxkro81QCDyFIouhUOBaTA3osqNu0kxAA6hW7F9bsqDmFM4Q R6iICwah44W7Aw02tXtBsANEWKjVZWuAEYTw55s4V1MHGhfW2OOvVYRVHtNg7I8+dTaW OUOEBAnKd3SQXGkFxWAu+2AxLPZw1c4h0BhrPs74+IjgRzsZqGY1xsE3wgLfnBRgL/kL 1EhNPBFD2y9n5NfeFkyx01EgHmK2/MuDgOmJ/5BVz4tMks+uWLD5WVYnyaw5VLWcJOYy QCDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=t/iDf/08Hqnh7qlw7Jy7UKvuU3HIY5xYgp06B4uY4To=; b=tHQtWR8qzNLTPYDuiCufeQoI6Ss0Pe5xUmUV5Z7xYyMoTzmmcTIeoejOTbdHRRYQ4y vhdYwF/bd7TAKsTJ/XN7Dq3HgeRt5TjQM9RVTTcDKycshlSLZ8TQsUH0478DvUFJ+rew COQL6dyiUD/Llzd12RKyN7VX6lOQvsu+CfMH/LtY94IEua/ibSnWuelVm3jKGm3vdoQi 0c5EafAlUkbDUS+8BzgWlkBMb96EHitH+2LMeNaPl/Dzfznu9j6m+t39j+xatBql7cLJ OEvtQ90xkHRlUIItmD+PG4w6LHv2DSQ/vUzbTfVjkfGarPmIfxZSfABkd5jOk11yNPcl FjRA== X-Gm-Message-State: ANhLgQ0g9YDbe91Cg1CpTc/fJt7HocIPhXviPZIzoSoJv4xt+bAGJNoA lLASxVOzcDvOvZRUVH+6FxBiaUz0MUU= X-Google-Smtp-Source: ADFU+vs0E/yG0CYodYf7fS2ma31qfFp+4aAa8RVFh9snMUpMcbK53YDA02fjZ5vqHS544x1i/gJRyQ== X-Received: by 2002:a5d:4bc8:: with SMTP id l8mr9590278wrt.89.1583160230206; Mon, 02 Mar 2020 06:43:50 -0800 (PST) Return-Path: Received: from [10.0.0.122] ([84.203.56.244]) by smtp.googlemail.com with ESMTPSA id q125sm18113423wme.19.2020.03.02.06.43.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 02 Mar 2020 06:43:49 -0800 (PST) Subject: Re: [edk2-devel] [PATCH] Platform/RPi4/Library/PlatformBootManagerLib: remove dead logo code To: Ard Biesheuvel , edk2-devel-groups-io Cc: Andrei Warkentin References: <20200302030809.48143-1-awarkentin@vmware.com> From: "Pete Batard" Message-ID: Date: Mon, 2 Mar 2020 14:43:48 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit On 2020.03.02 14:22, Ard Biesheuvel wrote: > 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. Done in https://edk2.groups.io/g/devel/message/55214 You'll also find the other patch in https://edk2.groups.io/g/devel/message/55213 Regards, /Pete