From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.70]) by mx.groups.io with SMTP id smtpd.web11.9128.1583118513667661281 for ; Sun, 01 Mar 2020 19:08:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@vmware.com header.s=selector2 header.b=cUG4h8to; spf=pass (domain: vmware.com, ip: 40.107.244.70, mailfrom: awarkentin@vmware.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O6dMYe+F2003kKMSM0fj54vZQpf0IcYQQ/a5twedt9HA2wp5YRZyq6Og6MfAzTOcZ1FcLvF52or9GcZB+Ws/s4A6tFgXzlnRhzmikok1TtLhNP+HMSD3izDobRU/IlOSNVrlxsgPYWak+mdKMTgxF+8y8oqMFECuIOHB4yUbPymmzaL/jRb0QrSr7w4XDsr4k2vraQaA2/UMdFVZ0Zpvan8+dazQebOJaPpWKhupezQYUnUeZ5Xyiti0rVDPmg0QoCWn9coOsvTsxfySFyrJaeFoNetJCHjicnN7o6gshV37hhgdstKhqQh9qsc+Jl2j17BU79l6KBdBCDkv4jRI0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C+14+zXq2EuRt7cXI/iN6tMPglaC67jzERhr8i8Bp2w=; b=YI2d4q9+wasqM0S0bIOS7PWSErtFPsBNIElFavUKc7pOa2S9u/TwSW49Zzx7FT4OIsRKdYzoIQgpIq6S8U0ruduZqTsNOdiasHV1DRv9ApU4LxPMVN4ThIrDLykNH5TcYsFy0JK2r7cll5m8o3EKpRSPROp+LGLWoI53JvmD1CRwr3qiHgiqA7PoWUs6jr3CX07NC9OGbGDvp9qnLCDOdFMDu2YZjzmxpozLFDRwGVRUrlq446H2N2OUSSr5BINfeMqrYBF6U+kvK5Sw2WELSXyZA8jF8IMFV1NMZXg8afadowHbROJ1QLqnByD0grtgaqIeiOK3g6UnYrgWRHqAjA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com; dkim=pass header.d=vmware.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C+14+zXq2EuRt7cXI/iN6tMPglaC67jzERhr8i8Bp2w=; b=cUG4h8toD70UOZpu7f9EqOpElxtBWV6ANAhdN/A5tfSkUe/5sfJVRWraG7SUhZlV20YVD783Jbzr6a2L/69wZ137TISWEwkh3l8mkczJbCozTVRKrkwV/HlIvKS3mjZEl0Wq4RMCm0X012y+tdJJp3YRg9YH5/NJGc01t13K5fc= Received: from BN6PR05MB3411.namprd05.prod.outlook.com (2603:10b6:405:43::23) by BN6PR05MB3012.namprd05.prod.outlook.com (2603:10b6:404:36::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2793.9; Mon, 2 Mar 2020 03:08:32 +0000 Received: from BN6PR05MB3411.namprd05.prod.outlook.com ([fe80::5df3:40e3:521a:7f84]) by BN6PR05MB3411.namprd05.prod.outlook.com ([fe80::5df3:40e3:521a:7f84%5]) with mapi id 15.20.2793.011; Mon, 2 Mar 2020 03:08:31 +0000 Received: from ubuntu.localdomain (24.147.160.127) by SN4PR0501CA0145.namprd05.prod.outlook.com (2603:10b6:803:2c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2793.5 via Frontend Transport; Mon, 2 Mar 2020 03:08:31 +0000 From: "Andrei Warkentin" To: "devel@edk2.groups.io" CC: Andrei Warkentin Subject: [PATCH] Platform/RPi4/Library/PlatformBootManagerLib: remove dead logo code Thread-Topic: [PATCH] Platform/RPi4/Library/PlatformBootManagerLib: remove dead logo code Thread-Index: AQHV8D/ab9UD8pYrT0escPQLDEY3zQ== Date: Mon, 2 Mar 2020 03:08:31 +0000 Message-ID: <20200302030809.48143-1-awarkentin@vmware.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [24.147.160.127] x-clientproxiedby: SN4PR0501CA0145.namprd05.prod.outlook.com (2603:10b6:803:2c::23) To BN6PR05MB3411.namprd05.prod.outlook.com (2603:10b6:405:43::23) authentication-results: spf=none (sender IP is ) smtp.mailfrom=awarkentin@vmware.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 22b22926-3fab-4df6-3bb7-08d7be56fcd1 x-ms-traffictypediagnostic: BN6PR05MB3012:|BN6PR05MB3012: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8273; x-forefront-prvs: 033054F29A x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(376002)(396003)(136003)(346002)(39860400002)(366004)(199004)(189003)(316002)(1076003)(6486002)(2906002)(36756003)(71200400001)(8936002)(81156014)(81166006)(8676002)(5660300002)(52116002)(6916009)(19627235002)(6506007)(107886003)(956004)(86362001)(186003)(16526019)(26005)(6512007)(66556008)(66946007)(4326008)(66476007)(64756008)(66446008)(478600001)(2616005);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR05MB3012;H:BN6PR05MB3411.namprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: vmware.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: iTs2DCnC1Ezq8B3YzThl9A265cnoqhh1TyqzoaB+kr8MX4HZm58Q/NZiegXin+esc6i6PcvXa9KAkwNGhuNb3Y9rSOMNtGP2YQaBY9aWO+lNmjUTT3NWFbIbD3qkrS1xXPtBGjrI5+jWm+iqGg5BMJzb4Xet2UCCPrax5bPC1XHnRnb076XNQBa4ZlgE7jPWdZe2vX7A6SMz2YlnM/TBSh/QDzaIDoKJeu0ZUKHK68ijl/M1oY87zrWQNnJCPWbh82oWzDai19GudS02rA+sSaOLc9D4sKLTLVOGjWp95uIYxoVxHaEP9hco5uSnbN2EyuaN1z0/qleolzujYt/ZVWsPcyqs0FoEFU74Rxwqn3ylyoPNm8zHTKhhDZzxrd7s5/Pb/oAhcHig0nD+5vv5d3WEFB36i0aFavb036eot/SMci5fh3YULFI0dDd9o9iZ5guIaUXwJB2Gv9ykzEQmNEUTKy/Jb4CLu979yHiqcNvws0Ox950Xme68QdKg219S1E71A/D/XrBj+Gmcy7wROA== x-ms-exchange-antispam-messagedata: x2Ul/+IYUn9mzPkaWFehej7G6d8k7m7cJoUJvRXzH2P4+q12M/0WtnnaAxeFJQu6a4CP13jdE1XPfbNM6B7Cv2qyT6jGETnNdo0iLTTxWqMWR+CQRShCncq5hzxwchOr5haFnYkEa3pD9jLpjuIHgg== MIME-Version: 1.0 X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22b22926-3fab-4df6-3bb7-08d7be56fcd1 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Mar 2020 03:08:31.7508 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: qgW/tKu1vZfecPTf4s/DAKLuiAidzpXTOYTlIqtT7C7p4NWScAD7Kp5zg1PWuq1KGHY42nWLpwCQ83SgrY5kxQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR05MB3012 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable 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-B= ootGraphicsResourceTableDxe-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 =20 #include "PlatformBm.h" =20 @@ -691,7 +690,6 @@ PlatformBootManagerWaitCallback ( EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION White; UINT16 Timeout; EFI_STATUS Status; - EFI_BOOT_LOGO_PROTOCOL *BootLogo; =20 Timeout =3D PcdGet16 (PcdPlatformBootTimeOut); =20 @@ -711,22 +709,6 @@ PlatformBootManagerWaitCallback ( } else { Print (L"."); } - - if (TimeoutRemain =3D=3D 0) { - BootLogo =3D NULL; - - // - // Clear out the boot logo so that Windows displays its own logo - // instead of ours. - // - Status =3D gBS->LocateProtocol (&gEfiBootLogoProtocolGuid, NULL, (VOID= **)&BootLogo); - if (!EFI_ERROR (Status) && (BootLogo !=3D NULL)) { - Status =3D BootLogo->SetBootLogo (BootLogo, NULL, 0, 0, 0, 0); - ASSERT_EFI_ERROR (Status); - }; - - gST->ConOut->ClearScreen (gST->ConOut); - } } =20 /** diff --git a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBo= otManagerLib.inf b/Platform/RaspberryPi/Library/PlatformBootManagerLib/Plat= formBootManagerLib.inf index 79b75d667f..e40b3f096a 100644 --- a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManag= erLib.inf +++ b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManag= erLib.inf @@ -81,4 +81,3 @@ gEfiSimpleFileSystemProtocolGuid gEsrtManagementProtocolGuid gEfiUsb2HcProtocolGuid - gEfiBootLogoProtocolGuid --=20 2.17.1