From nobody Sat May 4 05:03:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44444+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1564125049274673.4611494556624; Fri, 26 Jul 2019 00:10:49 -0700 (PDT) Return-Path: X-Received: from m4a0039g.houston.softwaregrp.com (m4a0039g.houston.softwaregrp.com [15.124.2.85]) by groups.io with SMTP; Fri, 26 Jul 2019 00:10:48 -0700 X-Received: FROM m4a0039g.houston.softwaregrp.com (15.120.17.147) BY m4a0039g.houston.softwaregrp.com WITH ESMTP; Fri, 26 Jul 2019 07:10:42 +0000 X-Received: from M9W0067.microfocus.com (2002:f79:be::f79:be) by M4W0335.microfocus.com (2002:f78:1193::f78:1193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Fri, 26 Jul 2019 07:06:38 +0000 X-Received: from NAM05-DM3-obe.outbound.protection.outlook.com (15.124.72.12) by M9W0067.microfocus.com (15.121.0.190) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10 via Frontend Transport; Fri, 26 Jul 2019 07:06:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VgLIGgQ3H4XKx64YbE1E32CpDRkVUegzIMYPzYRMilv7r2yYTvw2rQN4volTpPFJvtUkilaYb++wPRed3dy7PdXJC0bs7ArdYjJPs7GDGd4G38yc1Pnd3SqmRlxQVW8DNt2m5+TKR9p1sNHCkpO9Q95gbOvxQTjWCZrtplTxNcsFeaHbIn5//mcl+ImydxFf4WiPbLQ4/3ou8/JEdeOvxYsvePQaTBPlSfAUoMCVOs3/ml7uJk9jact0cOhLRe6w8TD2Rp8HcJri6urM2SOQlDrzoUognjGaehIqNcUjBCzWKY0+b9PK4WcAWU3ieT5yqISEAypKCvPNtd888E3Tzw== 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=VoGdRvGzR03gprrDW31Oyu/VetQpkwtWjSLVbcbWtw4=; b=hU8PrmRiSDAg1J6gSMKW6fjKwDBPQ4UsAzoCquw2ICIlm91sX/e396U31MLvPw58841zHp4DFR4NyG1XvRrDY/zhW5Eel4TOSUl7xdocZGjQnD5wfm0Gpm64ptbzwMQyZ1smk5J8UpFefAghFw/CAqeDS1nmPjcPV0BrxYn4Q/9159/hkCHZqr+F2gwlJ92D5Lp1DXrTvYNPYBMQOlMRSKrOYM1nORQT+wMBFqDOT38qUsEuTBwufAJGOGV0fBC5pbum2aGsd8TbZY5XzXxdh4QQzXdsQtnHpqq7M+ZSalL4iZ7D0L+lXmdm8WZ85ulbvlCf17WDTh26T2ZZN4UaQg== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=suse.com;dmarc=pass action=none header.from=suse.com;dkim=pass header.d=suse.com;arc=none X-Received: from DM6PR18MB2489.namprd18.prod.outlook.com (20.179.105.16) by DM6PR18MB2923.namprd18.prod.outlook.com (20.179.51.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.14; Fri, 26 Jul 2019 07:06:38 +0000 X-Received: from DM6PR18MB2489.namprd18.prod.outlook.com ([fe80::ac83:47c9:cebd:9f0]) by DM6PR18MB2489.namprd18.prod.outlook.com ([fe80::ac83:47c9:cebd:9f0%7]) with mapi id 15.20.2115.005; Fri, 26 Jul 2019 07:06:38 +0000 From: "Gary Lin" To: "devel@edk2.groups.io" CC: Zailiang Sun , Yi Qian , Michael D Kinney Subject: [edk2-devel] [PATCH edk2-platforms 1/4] Vlv2TbltDevicePkg: Adjust the device priority Thread-Topic: [PATCH edk2-platforms 1/4] Vlv2TbltDevicePkg: Adjust the device priority Thread-Index: AQHVQ4Cqgvcqcz2L9EuHy9s23emOmw== Date: Fri, 26 Jul 2019 07:06:37 +0000 Message-ID: <20190726070612.3649-2-glin@suse.com> References: <20190726070612.3649-1-glin@suse.com> In-Reply-To: <20190726070612.3649-1-glin@suse.com> Accept-Language: zh-TW, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK0PR01CA0004.apcprd01.prod.exchangelabs.com (2603:1096:203:92::16) To DM6PR18MB2489.namprd18.prod.outlook.com (2603:10b6:5:184::16) x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [202.47.205.198] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d3966c2e-5688-4ffc-cdb1-08d71197cd3e x-ms-traffictypediagnostic: DM6PR18MB2923: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:173; Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+44444+1787277+3901457@groups.io; helo=web01.groups.io; received-spf: None (protection.outlook.com: suse.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: APpg1sQtZEpfrjWi/PwuSehBIFMSGTcfNuHyYUx/Uv6fHpn23gkg8OfptLAmp21rUReKBoqXREASXfDguqNyW6b8134xVoJ+EOAtzy9Ofzq01s9CKAIWtnyh84loQ84do4emWc0/oPGwKCna53evxUKYsQmXXqPjPR1ZwSwOq+gRh3Q1y9S3dFFvndKMQgNhESmW8JfJXD2YqvVwCj9xA//BTW6DLT1DuillFA9oAOrYacRItEqJahbFhc61A4VBRIzjfSj3wYpaBYQ2hhURDbSM0X3fENKTp64JGa3aSCG/JNOPuFrdaFSHam9s3aVvEg8uZ+13kt1k8PYC1lLSISLAeUzvtlpNBqiGcO9FeWAR4Psfs46jsMSBg/C4EdhyzawBdhQk0ngKn98z43RvjrDec0jvW5gHn0sZHUe9LlE= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: d3966c2e-5688-4ffc-cdb1-08d71197cd3e X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Jul 2019 07:06:37.8942 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 856b813c-16e5-49a5-85ec-6f081e13b527 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: GLin@suse.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR18MB2923 X-OriginatorOrg: suse.com Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,glin@suse.com Content-Language: en-US Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1564125048; bh=Hy/pW7CaWDVB/Lggu0I+qhULiZwRpKEkF5Mox2EVviM=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=SUg+RSRjE6qwQnhVt2C/AuYQ9eOkfMH9+wDYJF77C+vGeDV56iKefFpRDYDxnxeKq+m M0mEqiQOEo0+a/Lus2Xse28JKoLcS41W7AOakxzQz0G7XL/qOLaKYWCm4HenlpYPAIe2+ BjIadsHi43G/lK2CQsRBdhr1JN//HsjstE0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" In BootOptionPriority(), the higher number implies the lower boot priority. This commit lowers the priority of network booting and raises the priority of the local devices. Besides, SD and EMMC are also added to BootOptionPriority() since Minnowboard comes with a SD card slot. Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin --- Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/Platfor= mBootOption.c | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManage= rLib/PlatformBootOption.c b/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePla= tformBootManagerLib/PlatformBootOption.c index 84aa097d58..a73d54a97d 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/Pl= atformBootOption.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/Pl= atformBootOption.c @@ -499,11 +499,10 @@ BootOptionType ( Returns the priority number. OptionType EFI ------------------------------------ - PXE 2 - DVD 4 - USB 6 - NVME 7 - HDD 8 + HDD 2 + USB 4 + SATA/NVME/SD 6 + PXE/HTTP 8 EFI Shell 9 Others 100 =20 @@ -518,21 +517,22 @@ BootOptionPriority ( // EFI boot options // switch (BootOptionType (BootOption->FilePath)) { - case MSG_MAC_ADDR_DP: - case MSG_VLAN_DP: - case MSG_IPv4_DP: - case MSG_IPv6_DP: - return 2; + case MSG_USB_DP: + return 4; =20 case MSG_SATA_DP: case MSG_ATAPI_DP: case MSG_UFS_DP: case MSG_NVME_NAMESPACE_DP: - return 4; - - case MSG_USB_DP: + case MSG_SD_DP: + case MSG_EMMC_DP: return 6; =20 + case MSG_MAC_ADDR_DP: + case MSG_VLAN_DP: + case MSG_IPv4_DP: + case MSG_IPv6_DP: + return 8; } if (StrCmp (BootOption->Description, INTERNAL_UEFI_SHELL_NAME) =3D=3D = 0) { if (PcdGetBool (PcdBootToShellOnly)) { @@ -541,7 +541,7 @@ BootOptionPriority ( return 9; } if (StrCmp (BootOption->Description, UEFI_HARD_DRIVE_NAME) =3D=3D 0) { - return 8; + return 2; } return 100; } --=20 2.22.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#44444): https://edk2.groups.io/g/devel/message/44444 Mute This Topic: https://groups.io/mt/32606871/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 05:03:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44442+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1564124945856623.8919586232731; Fri, 26 Jul 2019 00:09:05 -0700 (PDT) Return-Path: X-Received: from m4a0040g.houston.softwaregrp.com (m4a0040g.houston.softwaregrp.com [15.124.2.86]) by groups.io with SMTP; Fri, 26 Jul 2019 00:09:05 -0700 X-Received: FROM m4a0040g.houston.softwaregrp.com (15.120.17.146) BY m4a0040g.houston.softwaregrp.com WITH ESMTP; Fri, 26 Jul 2019 07:09:01 +0000 X-Received: from M4W0335.microfocus.com (2002:f78:1193::f78:1193) by M4W0334.microfocus.com (2002:f78:1192::f78:1192) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Fri, 26 Jul 2019 07:06:40 +0000 X-Received: from NAM05-DM3-obe.outbound.protection.outlook.com (15.124.8.10) by M4W0335.microfocus.com (15.120.17.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10 via Frontend Transport; Fri, 26 Jul 2019 07:06:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FwK7TKvSeY6LKE+6wwnCXlaCJmAXd5UoIJO1Th9n6MFhTx0wFhDsB+tp9gw4dP6iAlhddsxzb+frGBysqBOcC357BVCqu3srgfxgix7A8xj4QFLOCp7B/V0YyrImuRWN6Xz0cczD6zNtkg4lDFisJVjCk9lSAr2IBT0P4+0YrGlXH+lE6yt4bVId+4SwcSZoRPJF9+wp+luefdoFIsu2j2uD3NhRAoR4TGStKFByf5U1wi3BC/uFTnpEMNmO5H8qOukVlNERsWgbbtT6cyWrcBSGiTOOTCX8xj70IwQUx+BYQsLvirh3UdClja6v9idgvE9/qgvg96AQX55+a5P0AA== 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=BNAaQXvQWjAh7vjtVTw1dB2RSa4g5iOGt7uiJ7pNzjk=; b=CnIKr0qUTzabf+qz4JJVVYkQWZr2reQ0DApkr/Ae0+rH0bt0Wc3kVx6xgVPmyImFvvNzaINjNFXTQO0GcDCHqDmlgvYWPZ6SguRMbIRdydMBaRJ+70o8PxveSqMx1njf6t85fuavlb6qZS0FgCXnkE2CVj5dKkLqRrhMPhKBqHzX88kq6mHalIyy5/A6MdTcnmgUfSFMD0R0atqSBi3IPsADDTK/sQEpKX57UR8ltLlwZbOlxevmjSw0LMhcO8gLJvjpkixT6HTIFickIGpxnWOoujes0H3u8M0kmt5qgDK8TRzxrP8GE6Ji0AXlHSEx3QaK/k9axyLqZJnXuIcQdg== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=suse.com;dmarc=pass action=none header.from=suse.com;dkim=pass header.d=suse.com;arc=none X-Received: from DM6PR18MB2489.namprd18.prod.outlook.com (20.179.105.16) by DM6PR18MB2923.namprd18.prod.outlook.com (20.179.51.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.14; Fri, 26 Jul 2019 07:06:40 +0000 X-Received: from DM6PR18MB2489.namprd18.prod.outlook.com ([fe80::ac83:47c9:cebd:9f0]) by DM6PR18MB2489.namprd18.prod.outlook.com ([fe80::ac83:47c9:cebd:9f0%7]) with mapi id 15.20.2115.005; Fri, 26 Jul 2019 07:06:40 +0000 From: "Gary Lin" To: "devel@edk2.groups.io" CC: Zailiang Sun , Yi Qian , Michael D Kinney Subject: [edk2-devel] [PATCH edk2-platforms 2/4] Vlv2TbltDevicePkg: Add the missing BootManagerMenuApp Thread-Topic: [PATCH edk2-platforms 2/4] Vlv2TbltDevicePkg: Add the missing BootManagerMenuApp Thread-Index: AQHVQ4CshPDzxTDO3kiOEse9F25Uiw== Date: Fri, 26 Jul 2019 07:06:39 +0000 Message-ID: <20190726070612.3649-3-glin@suse.com> References: <20190726070612.3649-1-glin@suse.com> In-Reply-To: <20190726070612.3649-1-glin@suse.com> Accept-Language: zh-TW, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK0PR01CA0004.apcprd01.prod.exchangelabs.com (2603:1096:203:92::16) To DM6PR18MB2489.namprd18.prod.outlook.com (2603:10b6:5:184::16) x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [202.47.205.198] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 486af6a6-782a-48f4-d727-08d71197ce6b x-ms-traffictypediagnostic: DM6PR18MB2923: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:949; Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+44442+1787277+3901457@groups.io; helo=web01.groups.io; received-spf: None (protection.outlook.com: suse.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: ZkyjQapnhU+kaF3QeV1tTo9nTM23ehlhfn+n64jmQOyfW7kH2loqWkLR4dNNJV5SjlBGozTW+Z+5xK5tpEaqI6s7SUuzwbkJxw/PUKXhgy8mF3auwf0g4MfCLACFou0ngPqhstlwRQnA7l2u9gnXxUHUDeLCrmmgNToDTdTmAzWKWnA7eOj7CcxZ9WxkhanBg3uNOu/mFMiRwlU0ap8v3YUYFWlSyfLwNKZEJS8i9XwUc3aXDauIcpyo21YlDlRMfBKA+Y0fnO/1Bbn6tXzvI4Xv53plkZ7GN7lUpb+a2xEwnPGlpZdfhcKJcP4fLk6GLGncBljygSN5W6pxQpon+0FnExbcVvT0OjnNm9vn4soN3Y6GwGoFRjJ+pPP8s5Zk3PaCZSwv9QvtohVwmqFSk/MSZCVwRy1Q9xuNpU9jfo4= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 486af6a6-782a-48f4-d727-08d71197ce6b X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Jul 2019 07:06:39.8971 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 856b813c-16e5-49a5-85ec-6f081e13b527 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: GLin@suse.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR18MB2923 X-OriginatorOrg: suse.com Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,glin@suse.com Content-Language: en-US Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1564124945; bh=NmKCB7vXURXz2yqX8RoGYH6SA1mCRsBcKOmYeJs2oh8=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=onVu5a8IzcczDCgqLk8Gk2X1Z7Ow0Slw9EsJuou/hVm4pxWQUo5WUFgBG3yZnlAE1FX RRihcDiyPGN+GS9XilLDCnZD0cXARccB9wo7VSuCfxvm8l12D8YC0bWs0XfmLC0cITsaa dXp1l4Act5b1wz9EaLVyBs39Lwrb6uS6CM4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BootManagerMenuApp wasn't imported so the Boot Device Menu never showed correctly. Also fix the description of UiApp. Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin --- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf | 3 ++- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 1 + Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Platform/In= tel/Vlv2TbltDevicePkg/PlatformPkg.fdf index 48058b663a..55a309444f 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -417,7 +417,8 @@ INF UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf INF MdeModulePkg/Universal/Metronome/Metronome.inf INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf INF MdeModulePkg/Logo/LogoDxe.inf -INF MdeModulePkg/Application/UiApp/UiApp.inf +INF RuleOverride =3D UI MdeModulePkg/Application/UiApp/UiApp.inf +INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platfor= m/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 30b47d8f32..463b952e65 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -924,6 +924,7 @@ NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanc= eManagerUiLib.inf } + MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf =20 MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform= /Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 57316d487b..ee18b45c97 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -939,6 +939,7 @@ NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanc= eManagerUiLib.inf } + MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf =20 MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf --=20 2.22.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#44442): https://edk2.groups.io/g/devel/message/44442 Mute This Topic: https://groups.io/mt/32606861/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 05:03:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44443+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1564124974881248.81505490194718; Fri, 26 Jul 2019 00:09:34 -0700 (PDT) Return-Path: X-Received: from m9a0002g.houston.softwaregrp.com (m9a0002g.houston.softwaregrp.com [15.124.64.67]) by groups.io with SMTP; Fri, 26 Jul 2019 00:09:33 -0700 X-Received: FROM m9a0002g.houston.softwaregrp.com (15.121.0.190) BY m9a0002g.houston.softwaregrp.com WITH ESMTP; Fri, 26 Jul 2019 07:09:30 +0000 X-Received: from M4W0334.microfocus.com (2002:f78:1192::f78:1192) by M9W0067.microfocus.com (2002:f79:be::f79:be) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Fri, 26 Jul 2019 07:06:42 +0000 X-Received: from NAM05-DM3-obe.outbound.protection.outlook.com (15.124.8.10) by M4W0334.microfocus.com (15.120.17.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10 via Frontend Transport; Fri, 26 Jul 2019 07:06:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OPLqRs1jyeIY1Kk4KYBbHe4zE2/8/JuV82owyfqHf7xJj+dGdlHO1QqYKqmksZiZAvoHsI5ogP1GRLWrfqJne1ajutUdBHdOPXL7YMZbRt6v0pLjwlr8s1hfaVBNApjXFLvFfNc6nwIJS1TLYDcqfXQaGyg6x0krpO5fw6VNnPxRxYDFWmK0lhALYxiESKLyDL3cQdFPf37tYXQTr8tM1m66mLXAYRtooEMA2UDHo9rgfnOCAlWT2xrP5Z+80BIsYrTjxKxI0L0O24srfWR7ytJJPrsyMmwmH6w4492rIhzt8pFwSWhRu3/k0xOjA+IAOeDzU+9GP+GCU1ea7rZvaA== 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=/JfrRkJb0KD58ROdc7tQ/tbnLvqvdPvfg7fOO81QCH8=; b=DQECoOVWO04lPAOjB200yik9migNUL0lUu7O/ABgqWwTP0tatFcIfyWqM6I61J3v1n6TLU3OgQ4yYyH7Ajiash9BAGoVVTEJs7sONv5EAAGJ1trHLB1ikQLlplMj1K55jHYtXQ+u0LMDLoRk/sB1zwik+1Lx73SeaoB23GsRO4HrPAFtT/H/LmZ+rdYnxRGFkB9CpfyVLvgoPx4VmJUS6nEqbojnswJjNi4Ft9D1jvFHvnACQ2kxKDCT3DfmJTpmAVqghSikDEonuXeKlnlQ4YzKG1AoJLsd8ny3VnMzUSLwX710AblKG6WRD1nNQtM9AIrYld6nqGQRRef0Yflj9g== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=suse.com;dmarc=pass action=none header.from=suse.com;dkim=pass header.d=suse.com;arc=none X-Received: from DM6PR18MB2489.namprd18.prod.outlook.com (20.179.105.16) by DM6PR18MB2923.namprd18.prod.outlook.com (20.179.51.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.14; Fri, 26 Jul 2019 07:06:41 +0000 X-Received: from DM6PR18MB2489.namprd18.prod.outlook.com ([fe80::ac83:47c9:cebd:9f0]) by DM6PR18MB2489.namprd18.prod.outlook.com ([fe80::ac83:47c9:cebd:9f0%7]) with mapi id 15.20.2115.005; Fri, 26 Jul 2019 07:06:41 +0000 From: "Gary Lin" To: "devel@edk2.groups.io" CC: Zailiang Sun , Yi Qian , Michael D Kinney Subject: [edk2-devel] [PATCH edk2-platforms 3/4] Vlv2TbltDevicePkg: Only sort boot options when necessary Thread-Topic: [PATCH edk2-platforms 3/4] Vlv2TbltDevicePkg: Only sort boot options when necessary Thread-Index: AQHVQ4CtYxt1N50pdEi1Q0sxOU5qYw== Date: Fri, 26 Jul 2019 07:06:41 +0000 Message-ID: <20190726070612.3649-4-glin@suse.com> References: <20190726070612.3649-1-glin@suse.com> In-Reply-To: <20190726070612.3649-1-glin@suse.com> Accept-Language: zh-TW, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK0PR01CA0004.apcprd01.prod.exchangelabs.com (2603:1096:203:92::16) To DM6PR18MB2489.namprd18.prod.outlook.com (2603:10b6:5:184::16) x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [202.47.205.198] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 180cb9b8-26bc-4ee0-c8e2-08d71197cf77 x-ms-traffictypediagnostic: DM6PR18MB2923: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7691; Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+44443+1787277+3901457@groups.io; helo=web01.groups.io; received-spf: None (protection.outlook.com: suse.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: aakWsV84iwcw4tKpbsn+TXMSlJdWnmxRmk5AKqOOBRa/rTicAIP296kq69mhiyk84qXDu/yy9lNNrBPlU4Frbh63WJkG1Tb5jrsRInDaskcqA72q1aQb90w55UnPIL4kH8Koc2xJPtGZmFzIQZKZ194X7lNEVv5HKcPR9CSuRe/d8RP2ol+MqhCXlJ+HHitiZNANb23f0VvnUe/ve+jIfAYiPcGQFp56Pf3Y23bMRhPGNPf+v3NP0lwl6d1JO5SeTs6/Os5bABMrzlMkCg/lB+Jx2+wsSs5g1X9MFmZAQEZopI1k/FEIPV3SPcyXm/Bzx30qRIAZ3LsxG5BEmrpHjsUUUNgawp4EHJ81CzW3hlMEBrjlzWfLOk9DRkAl7I7F8J0jm0jG/36DUnN2QzoD0+p4vciFEV68ABvWhemIyq8= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 180cb9b8-26bc-4ee0-c8e2-08d71197cf77 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Jul 2019 07:06:41.6101 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 856b813c-16e5-49a5-85ec-6f081e13b527 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: GLin@suse.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR18MB2923 X-OriginatorOrg: suse.com Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,glin@suse.com Content-Language: en-US Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1564124974; bh=1NfAXiMlEamNfEwq2Ypvwfg6ejxlmrDQ1BFzTZyjfyw=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=pscIc5Fqpa0Qkru9GkahdSn4hBEfDunYg2cLADwjeID5lFq7DPsBfyvHjrW/TdmRlkz ZYSSpkA5wa1RbNF16k5hzHpF9E90Un3z6+QgYxVl9IDpWUQKOIHxP3/RU1svGydkemnSK YWGFD5ixXGRHaTprrp5te4Vg2isEKEHNY9I= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" * PlatformBootManagerAfterConsole() always sorted the boot options at the end, and this would invalidate the BootOrder created by the user. Besides, the current implementation would sort the boot options twice, and this is not efficient. We should just sort the boot options once at the end of the function only for the very first boot. * Update the string in IsNeedSortBootOption() to match the descriptions of BootManagerMenuApp. Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin --- Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/BdsPlat= form.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManage= rLib/BdsPlatform.c b/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBo= otManagerLib/BdsPlatform.c index 7fbbf281c6..a5423013a5 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/Bd= sPlatform.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/Bd= sPlatform.c @@ -1299,7 +1299,7 @@ IsNeedSortBootOption ( // if ((BootOptionCount > 1) && (((StrnCmp (BootOptions->Description, L"Enter Setup", StrLen (L"Ente= r Setup"))) =3D=3D 0) || - ((StrnCmp (BootOptions->Description, L"BootManagerMenuApp", StrLen = (L"BootManagerMenuApp"))) =3D=3D 0))) { + ((StrnCmp (BootOptions->Description, L"Boot Device List", StrLen (L= "Boot Device List"))) =3D=3D 0))) { return TRUE; } =20 @@ -1374,9 +1374,6 @@ PlatformBootManagerAfterConsole ( // EfiBootManagerRefreshAllBootOption (); =20 - if (IsNeedSortBootOption()) { - EfiBootManagerSortLoadOptionVariable (LoadOptionTypeBoot, CompareBoo= tOption); - } // // PXE boot option may appear after boot option enumeration // @@ -1400,7 +1397,9 @@ PlatformBootManagerAfterConsole ( Print (L"Press F7 for BootMenu!\n"); =20 EfiBootManagerRefreshAllBootOption (); - EfiBootManagerSortLoadOptionVariable (LoadOptionTypeBoot, CompareBootOpt= ion); + if (IsNeedSortBootOption()) { + EfiBootManagerSortLoadOptionVariable (LoadOptionTypeBoot, CompareBootO= ption); + } } =20 /** --=20 2.22.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#44443): https://edk2.groups.io/g/devel/message/44443 Mute This Topic: https://groups.io/mt/32606868/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 05:03:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44445+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1564125051991644.849195000059; Fri, 26 Jul 2019 00:10:51 -0700 (PDT) Return-Path: X-Received: from m4a0039g.houston.softwaregrp.com (m4a0039g.houston.softwaregrp.com [15.124.2.85]) by groups.io with SMTP; Fri, 26 Jul 2019 00:10:51 -0700 X-Received: FROM m4a0039g.houston.softwaregrp.com (15.120.17.147) BY m4a0039g.houston.softwaregrp.com WITH ESMTP; Fri, 26 Jul 2019 07:10:45 +0000 X-Received: from M4W0335.microfocus.com (2002:f78:1193::f78:1193) by M4W0335.microfocus.com (2002:f78:1193::f78:1193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Fri, 26 Jul 2019 07:06:44 +0000 X-Received: from NAM05-DM3-obe.outbound.protection.outlook.com (15.124.8.10) by M4W0335.microfocus.com (15.120.17.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10 via Frontend Transport; Fri, 26 Jul 2019 07:06:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=giR1+I9Up1eL8rIaaBK05xhmfhTP81BQBAgIHgZhKyRQEh0MQOd8ZlPtWgjo0ms+KV7iLF8bU93aMwmsGwqTtiF6IuWhRNRNttvRkGA5PdDlNaH3SdMd1A/mAgmXblZuoM/5ng/P6i7Aa1A10t21/M5jiZfoBDirMdvjUush+OXybRHMBiFYQtXZhunQ9iJL01Tg50LZ8zATaoOKsJvBH2dnW8FdXSx/6rC9S4izf9SBWWtC1s0Oa3p1hQC1aVEKvHOG4S2GCyVOpfc8PFvHn6lANy3f8ZZbsKsRKATwM9vjbGeA927vk8y5n2784fXHnfgv5QDKFGJIlVigV1Z2zg== 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=dw1WfE+6EbGahA2dLQThEcwCmql3g6sXRIvaQAkouxk=; b=TXPnrk2YTi2VMSmFhogI3yQr8Qp0IdqJL0zdJvI0F/V3Skdl39150Upiq/GIf8rV5r05Z4HfFnNta3rRzT5TVrVMDLhqXMZ4M6PQz+Dw8Cc5bCIDY/GABZU2NjLstlAbkxb4nJrHkQc4HWlm27TccD14px5J5zHvurOENxZzycX5qAlwGUG+G3a+Tl0WfgYqDgqIubP1RwATl72kJYLH2zd5mHVfmhBc7mAmrsJugKNSR4tmbG8jwCLAFM03oNoor48TLGE7DtID5pJBjSPuWAzFQOqaWZpNVlxLqVkt5NnD+bpnt3iIiKyqRtwpbSSFznp82LJtEaQm9TxJtKi4oA== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=suse.com;dmarc=pass action=none header.from=suse.com;dkim=pass header.d=suse.com;arc=none X-Received: from DM6PR18MB2489.namprd18.prod.outlook.com (20.179.105.16) by DM6PR18MB2923.namprd18.prod.outlook.com (20.179.51.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.14; Fri, 26 Jul 2019 07:06:43 +0000 X-Received: from DM6PR18MB2489.namprd18.prod.outlook.com ([fe80::ac83:47c9:cebd:9f0]) by DM6PR18MB2489.namprd18.prod.outlook.com ([fe80::ac83:47c9:cebd:9f0%7]) with mapi id 15.20.2115.005; Fri, 26 Jul 2019 07:06:43 +0000 From: "Gary Lin" To: "devel@edk2.groups.io" CC: Zailiang Sun , Yi Qian , Michael D Kinney Subject: [edk2-devel] [PATCH edk2-platforms 4/4] Vlv2TbltDevicePkg: Clean up the unused variables and function Thread-Topic: [PATCH edk2-platforms 4/4] Vlv2TbltDevicePkg: Clean up the unused variables and function Thread-Index: AQHVQ4CuaebdMTFCe0W0pqG3h6a6Hw== Date: Fri, 26 Jul 2019 07:06:43 +0000 Message-ID: <20190726070612.3649-5-glin@suse.com> References: <20190726070612.3649-1-glin@suse.com> In-Reply-To: <20190726070612.3649-1-glin@suse.com> Accept-Language: zh-TW, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK0PR01CA0004.apcprd01.prod.exchangelabs.com (2603:1096:203:92::16) To DM6PR18MB2489.namprd18.prod.outlook.com (2603:10b6:5:184::16) x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [202.47.205.198] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d931895c-787a-4547-2bdd-08d71197d07d x-ms-traffictypediagnostic: DM6PR18MB2923: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2449; Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+44445+1787277+3901457@groups.io; helo=web01.groups.io; received-spf: None (protection.outlook.com: suse.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: tGZNDdVUHhY7QUsnasXxeTsluS61DjkFdBALbBWVBBQ0RyrMVYDDXA7MqfINNkpwOvk40528vqXnfjCbYY9Tc8rYkaLFAOIUje4o25u+R3xFKsYj30nlUo+GBJ+sYOXriV1tDq0/H/z1+vRX05P8p+Qq4r6O2laQrkJNdOfLAPjuQOLaYw43k/oLWji+GtonvVTQcMiZUGHe4UPNnSkUWn0zqv+lrjh2kofMo01e40naqvNePrlrdXSqlHIJh0EgToR8TVEkJqDYDC0RPt888ROVJ9AJBVS6ZbsY65stRNfko94BZMRtyx2vclQI0/7mB1mKGuuHETt12WKSc43uvtPeyzsJGN+7HMYxppmzqPyBWbtHqa/slOQoAj3wR56Ced/04kaIWmzO0Rnr4FH7dqdDswxvLyBty2L+9npReqo= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: d931895c-787a-4547-2bdd-08d71197d07d X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Jul 2019 07:06:43.3221 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 856b813c-16e5-49a5-85ec-6f081e13b527 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: GLin@suse.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR18MB2923 X-OriginatorOrg: suse.com Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,glin@suse.com Content-Language: en-US Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1564125051; bh=BACIRA1vuQMjz15bhClqCi52X3sZPgCT8dYdFyJycsY=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=KrOFdxaT0Gll2Io/iL36K+Qx8WBRo1HhWk7+pIc6WYXzhA3TAybSORupc5N1D1IwuIp uYRfz8cGj5vsmQkEhjD30U6n6su3pt/Dd9GCu32PlGnUX0lWDmYawrOeXzbnYogWiG6fW CxX3CCUpu5AzcFHkjFI12JNuNvahfHa04Z4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" In PlatformBootOption.c: * mContinueBoot and mBootMenuBoot were assigned as "!EnterSetup" before being used. However, EnterSetup is always "FALSE", so it's meaningless to keep those variables. * mPxeBoot is defined but never used. * DetectKeypressCallback() is never used. So we can remove it altogether with mHotKeypressed and HotKeyEvent. Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin --- Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/Platfor= mBootOption.c | 57 ++++---------------- 1 file changed, 11 insertions(+), 46 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManage= rLib/PlatformBootOption.c b/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePla= tformBootManagerLib/PlatformBootOption.c index a73d54a97d..539127e93f 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/Pl= atformBootOption.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/Pl= atformBootOption.c @@ -10,12 +10,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #include =20 -BOOLEAN mContinueBoot =3D FALSE; -BOOLEAN mBootMenuBoot =3D FALSE; -BOOLEAN mPxeBoot =3D FALSE; -BOOLEAN mHotKeypressed =3D FALSE; -EFI_EVENT HotKeyEvent =3D NULL; - UINTN mBootMenuOptionNumber; =20 EFI_DEVICE_PATH_PROTOCOL * @@ -396,21 +390,6 @@ RegisterBootOptionHotkey ( } } =20 -EFI_STATUS -EFIAPI -DetectKeypressCallback ( - IN EFI_KEY_DATA *KeyData -) -{ - mHotKeypressed =3D TRUE; - - if (HotKeyEvent !=3D NULL) { - gBS->SignalEvent(HotKeyEvent); - } - - return EFI_SUCCESS; -} - /** This function is called after all the boot options are enumerated and or= dered properly. **/ @@ -419,46 +398,32 @@ RegisterStaticHotkey ( VOID ) { - EFI_INPUT_KEY Enter; - EFI_KEY_DATA F2; - EFI_KEY_DATA F7; - BOOLEAN EnterSetup; + EFI_INPUT_KEY F2; + EFI_INPUT_KEY F7; EFI_STATUS Status; EFI_BOOT_MANAGER_LOAD_OPTION BootOption; =20 - EnterSetup =3D FALSE; - // // [Enter] // - mContinueBoot =3D !EnterSetup; - if (mContinueBoot) { - Enter.ScanCode =3D SCAN_NULL; - Enter.UnicodeChar =3D CHAR_CARRIAGE_RETURN; - EfiBootManagerRegisterContinueKeyOption (0, &Enter, NULL); - } - + Enter.ScanCode =3D SCAN_NULL; + Enter.UnicodeChar =3D CHAR_CARRIAGE_RETURN; + EfiBootManagerRegisterContinueKeyOption (0, &Enter, NULL); =20 // // [F2]/[F7] // - F2.Key.ScanCode =3D SCAN_F2; - F2.Key.UnicodeChar =3D CHAR_NULL; - F2.KeyState.KeyShiftState =3D EFI_SHIFT_STATE_VALID; - F2.KeyState.KeyToggleState =3D 0; + F2.ScanCode =3D SCAN_F2; + F2.UnicodeChar =3D CHAR_NULL; Status =3D EfiBootManagerGetBootManagerMenu (&BootOption); ASSERT_EFI_ERROR (Status); - RegisterBootOptionHotkey ((UINT16) BootOption.OptionNumber, &F2.Key, TRU= E); + RegisterBootOptionHotkey ((UINT16) BootOption.OptionNumber, &F2, TRUE); EfiBootManagerFreeLoadOption (&BootOption); =20 - F7.Key.ScanCode =3D SCAN_F7; - F7.Key.UnicodeChar =3D CHAR_NULL; - F7.KeyState.KeyShiftState =3D EFI_SHIFT_STATE_VALID; - F7.KeyState.KeyToggleState =3D 0; - mBootMenuBoot =3D !EnterSetup; - RegisterBootOptionHotkey ((UINT16) mBootMenuOptionNumber, &F7.Key, mBoot= MenuBoot); - + F7.ScanCode =3D SCAN_F7; + F7.UnicodeChar =3D CHAR_NULL; + RegisterBootOptionHotkey ((UINT16) mBootMenuOptionNumber, &F7, TRUE); } =20 UINT8 --=20 2.22.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#44445): https://edk2.groups.io/g/devel/message/44445 Mute This Topic: https://groups.io/mt/32606872/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-