From nobody Sun May 5 12:05:52 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+44598+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 1564474896627115.6667438145688; Tue, 30 Jul 2019 01:21:36 -0700 (PDT) Return-Path: X-Received: from m9a0001g.houston.softwaregrp.com (m9a0001g.houston.softwaregrp.com [15.124.64.66]) by groups.io with SMTP; Tue, 30 Jul 2019 01:21:35 -0700 X-Received: FROM m9a0001g.houston.softwaregrp.com (15.121.0.190) BY m9a0001g.houston.softwaregrp.com WITH ESMTP; Tue, 30 Jul 2019 08:21:34 +0000 X-Received: from M9W0067.microfocus.com (2002:f79:be::f79:be) 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; Tue, 30 Jul 2019 08:16:11 +0000 X-Received: from NAM03-CO1-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; Tue, 30 Jul 2019 08:16:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lj2oORN1o8RtQPR7XmzpcB9SxoEp7TvGE9CwuiqI61nxpTUnE95elsoCvv97q2YjwabOOpMoN452ZiGHVHS2QVVpyabYoSlfJcmzpUxeiKspGmYdA41PsO7XYuQwYMCRpt27ilMDJqbvBswhMN5haWgK04r23qDtGEAXl9XNn+PiQAUOwjr/OoJhj6WOdQutISh1UmdtKH/dgiDeE2SCjK2b/Qtx9jj973sn+9SWg8xq3RcusIsNSs7RzgA3DhinsJvxLJNJciPhGE9RNK725IEfMGiErpIkAfuusKF14VatTqbi2p4se5xF3YJhTupAjDWAwjKlU6rVMYdeK+jnxg== 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=G8KPBhmywrCPdQQwXd7iFQeWVdVI8ufXm8Q1M8qroXc=; b=Sq5uWSdnQefLf6p51Iva0Q+OOiUwDIc9REbiUz7Rr9ZF9fvfffrV9Flqt9w93AukEjTFcSwFM+kO7kkzTecn8H3vecnrfeXw3DNvFPfJoi1TXVddo8oMWK9X+QuOqWaxfdFem8BBCA36OCIvFIqkRvmWaW0ksld4eOIYoTAsZwD8QFzkTTVk6qY2CPGje2EBqwaWUTpIpqezpjaXOwouA5nmbIpl02m5QY0IZVe6Apb4D8C5F2MZPMjg9O6FhZohn2+nud9xkoDiAJuTsXFzJqwVdUzoaV9Q0CPwK31nqi4iks7ycn9+6BerKQU8Mja114KR1Xg4cNEYJQKGnG1IMQ== 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 DM6PR18MB3068.namprd18.prod.outlook.com (20.179.48.77) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.14; Tue, 30 Jul 2019 08:16:08 +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; Tue, 30 Jul 2019 08:16:08 +0000 From: "Gary Lin" To: "devel@edk2.groups.io" CC: Zailiang Sun , Yi Qian , Michael D Kinney Subject: [edk2-devel] [edk2-platforms] [PATCH v2 1/6] Vlv2TbltDevicePkg: Adjust the device priority Thread-Topic: [edk2-platforms] [PATCH v2 1/6] Vlv2TbltDevicePkg: Adjust the device priority Thread-Index: AQHVRq8Kzu9/+EvJ50K2bsOyAK/gsg== Date: Tue, 30 Jul 2019 08:16:08 +0000 Message-ID: <20190730081518.16349-2-glin@suse.com> References: <20190730081518.16349-1-glin@suse.com> In-Reply-To: <20190730081518.16349-1-glin@suse.com> Accept-Language: zh-TW, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: DB6PR1001CA0031.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:55::17) 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: 578478c0-1a2d-47c3-a2b3-08d714c62cba x-ms-traffictypediagnostic: DM6PR18MB3068: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:193; 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+44598+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: fhj+aPrYt2ZlrXyJWmUdXAzpF1RZQmkSdJN1eVqDvs1npRGbeS+FhIhxpuik0jdnE/tunPL2GQU305fBPwePM9gadONACaE1iVcQVqDIMl05CorBAGcApEqokWG+cOc7bMCwcb25NSLeWVMqnqTnDZ4018DDrW4TUo9n8Z5n90P7l+DE9AhHyVR2//2IJPZNbRokwsV2QPSoFPwr347BtffagrCfyHx6gPi/91bO38yhikzQrmblgC1laN87Ze8lJ9wj3B8JUF6fJP8qSHBXwy57p8HlijeCCrXNtCSsmQWTxvnuff2gcpoD3kRTY2NL/sRV+I67AATu2jMmlu72vi7FuLgPwo6XgxArbg4fS9W10gY1xA+x7NI39zXTeHtistgdB5ZoRDw735W9p7n54X2KsUKRmYEquH2SKoERU6I= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 578478c0-1a2d-47c3-a2b3-08d714c62cba X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jul 2019 08:16:08.6721 (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: DM6PR18MB3068 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=1564474896; bh=zd8akumw6qmVUzZ678fgNFjB3WP780sTXrRtUbJjGqo=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=mo9jDmQo4k8kdxc8tOx+IJfGd6/vYbtOoxqLhK45bFmCpKviEbyVKMPS8UI7zqhOdr3 +bIfg9Me3LfeIzY3kE0RCsW1Q71rRkCPc+uMztzeLfVNDHd9qdga8CR0ZKKadDOxrnTBs fr3E5f8/TzGmhdA9Vt628VEtx6rZlj5UfW8= 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. v2: Also match MSG_URI_DP to sort HTTP Boot options Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/Platfor= mBootOption.c | 29 ++++++++++---------- 1 file changed, 15 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..195b3f3097 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,23 @@ 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: + case MSG_URI_DP: + return 8; } if (StrCmp (BootOption->Description, INTERNAL_UEFI_SHELL_NAME) =3D=3D = 0) { if (PcdGetBool (PcdBootToShellOnly)) { @@ -541,7 +542,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 (#44598): https://edk2.groups.io/g/devel/message/44598 Mute This Topic: https://groups.io/mt/32651927/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 Sun May 5 12:05:52 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+44594+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 156447473882778.6372381538464; Tue, 30 Jul 2019 01:18:58 -0700 (PDT) Return-Path: X-Received: from m9a0003g.houston.softwaregrp.com (m9a0003g.houston.softwaregrp.com [15.124.64.68]) by groups.io with SMTP; Tue, 30 Jul 2019 01:18:58 -0700 X-Received: FROM m9a0003g.houston.softwaregrp.com (15.121.0.191) BY m9a0003g.houston.softwaregrp.com WITH ESMTP; Tue, 30 Jul 2019 08:18:47 +0000 X-Received: from M9W0068.microfocus.com (2002:f79:bf::f79:bf) by M9W0068.microfocus.com (2002:f79:bf::f79:bf) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Tue, 30 Jul 2019 08:16:12 +0000 X-Received: from NAM03-CO1-obe.outbound.protection.outlook.com (15.124.72.14) by M9W0068.microfocus.com (15.121.0.191) 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; Tue, 30 Jul 2019 08:16:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ny5MHMHGyO+1cxdMDYRX9LsgeMMqjZAnbF1gU9q1aORm98AoimmY5qtGt7lYEdMeHY6f2+scflgfU/ip5zZJ3JLP8Czgxuc5NFTc81eTlNhqMYt++hbnUCGj2e4h+FoBtEAHmHGRKOx8eGd7tXYUc8OumhZDeGKBDO/+4qFyi6K2Gm+/yjJZdxvCuPUp22ZqBkpI7Sml3BCxMY+DEWD0KxqELQbKOBnFa7tpQMVTTqs8o8Q3cmx8Juo3VMJQbS7x+4NBu7sMbl2iOXz1UWdNcdHeeJLsfL/O6qx2AykMTvIL6o/zE8vSVUEgCAXpFxzp68hOPEdoUxD1s9KxEHxXJA== 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=sXfjYzbqsWsZAYMxn6f+uOCaTf+t534R2nQI8XHijiE=; b=FRY/elPQUfOSbTqd2X/QTOE8/ZVYAVW7nrPxVpcCSjobdLuyV11cYttSDijzX0LpaGnxKWK3hXbVjBvUHeWt0+hic5gnOcL0Q5BTDbjPZ+0NK7JUcXooCSBUdbfPhFQulOdgxpJAkD0u3CBHHKzA4X3FhLUEI7HSVHVlASDUzukZwwofQQukfaJkUbbVX6OEgbZ96KC16Zh6tuC9te11tUyMdaeZGzWddwU+EQ58WcIW2mTFzqe2OjO+KvpfCnspPGjT3ogk0rbT0N+QrWiC1Z0Y4+IlA5o91oCW2VXrjW7NdC7hF/VoPJFmxKPtBSDl8ccjAmt548K3cF+FsDex1Q== 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 DM6PR18MB3068.namprd18.prod.outlook.com (20.179.48.77) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.14; Tue, 30 Jul 2019 08:16:11 +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; Tue, 30 Jul 2019 08:16:11 +0000 From: "Gary Lin" To: "devel@edk2.groups.io" CC: Zailiang Sun , Yi Qian , Michael D Kinney Subject: [edk2-devel] [edk2-platforms] [PATCH v2 2/6] Vlv2TbltDevicePkg: Add the missing BootManagerMenuApp Thread-Topic: [edk2-platforms] [PATCH v2 2/6] Vlv2TbltDevicePkg: Add the missing BootManagerMenuApp Thread-Index: AQHVRq8MwM04+NfTxkOFbm9YRChQpg== Date: Tue, 30 Jul 2019 08:16:11 +0000 Message-ID: <20190730081518.16349-3-glin@suse.com> References: <20190730081518.16349-1-glin@suse.com> In-Reply-To: <20190730081518.16349-1-glin@suse.com> Accept-Language: zh-TW, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: DB6PR1001CA0031.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:55::17) 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: efa34b86-a282-47a5-b9fd-08d714c62e8f x-ms-traffictypediagnostic: DM6PR18MB3068: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5516; 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+44594+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: tUaraau2jdganEq+2hjaSw77BDXZQPSE7Mws9UEsn2fJpOaOZQ7XMTRXFp4kK1qzAjean66ceIlf5mSVETSaFmKaTrCVM8Z0Ty2C7a4J+yDRW4Uj1fiSm5XeLahkEerPGyVgpAHiTaH1bkAHtO7ms61jl6MXi4U/tvqGQHOBYXM/jTV6MXvUQLpUUAraHdcT1kFK22mjdJj1ZkoWyshyKflB33br2aSr7X2n8UtkeBjWD2hCg5sZ/JiUPcQeuBenRjDv0pYZjDUVF+0h6rDL9WFyLnYoCF1dGaSeKc/2VKFwEFr2PwgHvRRDJaPSN3B3kqoE8pFKpcQ7l0H4mBjZW6K3fqGvpR60wTRo8F4j8QZgTamJvTyzthPEgh9/32zKvxOmQ8d4ODayCU2qBhubkEwuon8bsmPm4MdxfnRlCnk= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: efa34b86-a282-47a5-b9fd-08d714c62e8f X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jul 2019 08:16:11.7003 (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: DM6PR18MB3068 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=1564474738; bh=MUKTgyKVP+shAVd87MB0x+1f+4KuYcQazykyxRDqEic=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=drcR/pIzbhgd3bKEFsv4+4Eu6bJz4o55bIoYDGfitMcR/EtkHysyKsWVutKbgYvhvzu As1LUxitfI2Zaxze5LAkXKGSEB2GnMBwH23DGntHTLrJdvcnLco1p2Dd3Z6+jEzlKbGkN kwMi+8WFodJdCwuUxr4risS+qO6juhl/pqY= 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. In the "Rule.Common.UEFI_APPLICATION.UI" section, it intends to change the description of UiApp to "Enter Setup" to make the boot option self-explaining in the Boot Menu. But this didn't happen since the rule wasn't assigned to UiApp correctly, so the Boot Menu only showed "UiApp" which is not understandable to users. This patch adds "RuleOverride =3D U= I" to UiApp.inf to change the description. v2: Update the description Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-by: Michael D Kinney --- 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 (#44594): https://edk2.groups.io/g/devel/message/44594 Mute This Topic: https://groups.io/mt/32651917/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 Sun May 5 12:05:52 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+44595+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 156447474394934.20255286211295; Tue, 30 Jul 2019 01:19:03 -0700 (PDT) Return-Path: X-Received: from m9a0003g.houston.softwaregrp.com (m9a0003g.houston.softwaregrp.com [15.124.64.68]) by groups.io with SMTP; Tue, 30 Jul 2019 01:19:03 -0700 X-Received: FROM m9a0003g.houston.softwaregrp.com (15.121.0.191) BY m9a0003g.houston.softwaregrp.com WITH ESMTP; Tue, 30 Jul 2019 08:18:59 +0000 X-Received: from M9W0068.microfocus.com (2002:f79:bf::f79:bf) by M9W0068.microfocus.com (2002:f79:bf::f79:bf) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Tue, 30 Jul 2019 08:16:15 +0000 X-Received: from NAM03-CO1-obe.outbound.protection.outlook.com (15.124.72.14) by M9W0068.microfocus.com (15.121.0.191) 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; Tue, 30 Jul 2019 08:16:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DTs+slakhgaA4y8WCSgdUDI6Oirj4ZJyXj7LXN47wp7NHXKtRc0t3XiUBMDsjdEsu/r2yYDylo2H1X3sWrpDYHgT3Yigo0E3JWpWHYq93xupJ9GnZt2nKJkE1DIDlWBFG3cikfcWvu+aukFVaC2TT+/0GwdvtIERtlUNO9ZiJjmPYqpeWx3wv9HT0buwk6m4l3NM2crvVJGO9xP6vrltmqKr3Fmw+G4Vp9+tCdyH7rniucabMojEBgSrF2OL+rPWGZPW8+DGahVetCstxVtVHnGU+Rgucz/lNZPn9PnO1z+8g9eWYD14yxeNROoFT/2npbtMueRMS31cXhmOjnzvag== 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=/dO38PpVZXLGcmXz5y08XxAU4v0LMb35PyDyqCNPHw8=; b=HnAzhkm74z9DCnEwJDmj+Cba+1zjjPRQpVE54dPq1AMnMoUI0XQKmrl/h6sSSCMiUPMTO2tekJ2SU7olqOa3luVRolnYi+Vbd61fpOAkbEQlHp7eUn0ncmgLaDL/EA5G7lyNqibCbqPnXfZjYVdU0BGuMzhzmEXMSotMTfGud/NRZix78IQDG5F0xKhTnWltcxnoiv528dkNazs+NGcxMhNA8Ke2DoEGrN2EtmaWTTB1c3rkkTTYhyKCcjyl3dRHuRp8AB/d/lTF+rx9SucQnxhy8i8p+MH2fThr/fhNY8CdM/3ad9J9tMJs6cQd3Dn3zFIiThwmp6aMkgQ5OdcgJg== 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 DM6PR18MB3068.namprd18.prod.outlook.com (20.179.48.77) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.14; Tue, 30 Jul 2019 08:16:14 +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; Tue, 30 Jul 2019 08:16:14 +0000 From: "Gary Lin" To: "devel@edk2.groups.io" CC: Zailiang Sun , Yi Qian , Michael D Kinney Subject: [edk2-devel] [edk2-platforms] [PATCH v2 3/6] Vlv2TbltDevicePkg: Only sort boot options when necessary Thread-Topic: [edk2-platforms] [PATCH v2 3/6] Vlv2TbltDevicePkg: Only sort boot options when necessary Thread-Index: AQHVRq8Ozud1h4iku02k8XAwPqnAsw== Date: Tue, 30 Jul 2019 08:16:14 +0000 Message-ID: <20190730081518.16349-4-glin@suse.com> References: <20190730081518.16349-1-glin@suse.com> In-Reply-To: <20190730081518.16349-1-glin@suse.com> Accept-Language: zh-TW, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: DB6PR1001CA0031.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:55::17) 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: 972cdf24-ba51-4206-16ff-08d714c63060 x-ms-traffictypediagnostic: DM6PR18MB3068: 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+44595+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: Vn+sQ5VNWOY41VAlSBoG0O32FDZyzGdxqMUczWmvOSI7eKesQCkaNcQdU6n2oj3UPaC+ENyaKjIHje8xqEiFVeR7nDtTdJp392nViKTFP2JoPpWVCc5qt4+LbjJr5f+kRg99zNtMZNK4xxzsi8otUJEPi18mgLveNfa9gP7Abewnqa+Tv5RU3aohx8JKuhCi8AKn6HcnjWF46jVv1t74vePAGnpH8nCRluPLVqzW/LtGlPTC98FvVjwxD5ZMhlpD18EftpQRmTohv2GcpHlEwnaQxvmhhy1WNOZY9lLOIH6cD7J8A5nVuTSDHCyUZU/LToNxmtKZXJk2e9SjT24lei6SqDrz5O1XFYHxWjCrBbBRapwzR0v08OI06Sd4Ik7tkcQYFNFjFGez+diqrk/VJElBZXisdxJMwYvOhh9+prA= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 972cdf24-ba51-4206-16ff-08d714c63060 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jul 2019 08:16:14.7476 (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: DM6PR18MB3068 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=1564474743; bh=Jybc1S7JH+EgZ8lEJjyZ4BPN0enZ65uQ0MpqGas8bEI=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=n7RVzfDyv4p3RCNNygP5EBX3xfcDDRou6idlZiBVlvTseuMHTaRKVBu4UjIVJRh4JN6 OXFJ6mIDkhUjlfmrRDzePfT32hUMlwljrVKpqm3JP9LZlrH7qBzPixj1aYMhuPTFWHNq/ LUtiMfxK/xz3HEcao/aXZz+CmxtR3HhIVA0= 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 description of BootManagerMenuApp. Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-by: Michael D Kinney --- 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 (#44595): https://edk2.groups.io/g/devel/message/44595 Mute This Topic: https://groups.io/mt/32651918/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 Sun May 5 12:05:52 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+44596+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 156447475608255.65055237425349; Tue, 30 Jul 2019 01:19:16 -0700 (PDT) Return-Path: X-Received: from m9a0003g.houston.softwaregrp.com (m9a0003g.houston.softwaregrp.com [15.124.64.68]) by groups.io with SMTP; Tue, 30 Jul 2019 01:19:15 -0700 X-Received: FROM m9a0003g.houston.softwaregrp.com (15.121.0.191) BY m9a0003g.houston.softwaregrp.com WITH ESMTP; Tue, 30 Jul 2019 08:19:12 +0000 X-Received: from M9W0068.microfocus.com (2002:f79:bf::f79:bf) by M9W0068.microfocus.com (2002:f79:bf::f79:bf) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Tue, 30 Jul 2019 08:16:18 +0000 X-Received: from NAM03-CO1-obe.outbound.protection.outlook.com (15.124.72.14) by M9W0068.microfocus.com (15.121.0.191) 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; Tue, 30 Jul 2019 08:16:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kLVZNbXGAmjIF2UxLRAGmPhrIZCF4x/6Z1xsNC5yueWL27MW5NIfS7uncTNc7EcOp82l8GjA0Oq5QFGWfE9WR2gSYOCC+VOBS8SmpLFY4qEVr3xDUs0RWhOyWZsNi8kNLR12QdLHwRukpgQhMCpTS3HZJzDpS3biUcE+SGu/+I+BzhZwmvLQAmsgvIqabQOmMfqAjdCJ/rTtbDzLhR1T6yARCnXNFBFD8azNBhDIQqKfIF7SzxLLd5Fn1B2+s4aykUQm+hZh+h7XoAuvPFZaiRnxlC/M6Cut8Mgq2dc3CcROP3GQRwxiCbvAONWEkzWFFG6eSRzK39njblZkTQfcOA== 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=3+KtRgcmL6Ma/oz+89SFSTZdh55xlW+F9Zq8/JKaQNk=; b=QUMyl0vRWlXfFkh/2BmQ+v9bfSYbwzHeS/sD/g6huR+PrAHCgPUy/v6fHIU10CUAMB7pu3SmjpCZM76+321n83GxhmwUogBPieWRsoGxlwZRctIvnmdoa95/Nc/BTtU4HYFNcKtgcq/jPtiR3u2EjzlnUxvTqvFUa8j5X7gZ6BlaIqm7AFe8fuFOXdbLRZtBFw70mHXkkJl+azSBwN/O/1IqeKSBX6gBoGgFWys5qg7WHyDscngv+5VFj5+CErysWP1V/inOL86cstD6GVyhu6y2VOk78kp0QSzX4wv/ECQ4iU5qGFa7JxgZnrcEe3zSSETPmn6wjRorppqGFJ28BQ== 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 DM6PR18MB3068.namprd18.prod.outlook.com (20.179.48.77) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.14; Tue, 30 Jul 2019 08:16:17 +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; Tue, 30 Jul 2019 08:16:17 +0000 From: "Gary Lin" To: "devel@edk2.groups.io" CC: Zailiang Sun , Yi Qian , Michael D Kinney Subject: [edk2-devel] [edk2-platforms] [PATCH v2 4/6] Vlv2TbltDevicePkg: Clean up the unused variables and function Thread-Topic: [edk2-platforms] [PATCH v2 4/6] Vlv2TbltDevicePkg: Clean up the unused variables and function Thread-Index: AQHVRq8Pzd3ACXfNuUC2ygId5x0nmw== Date: Tue, 30 Jul 2019 08:16:17 +0000 Message-ID: <20190730081518.16349-5-glin@suse.com> References: <20190730081518.16349-1-glin@suse.com> In-Reply-To: <20190730081518.16349-1-glin@suse.com> Accept-Language: zh-TW, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: DB6PR1001CA0031.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:55::17) 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: 67b9ec15-5eae-4339-89d6-08d714c6322f x-ms-traffictypediagnostic: DM6PR18MB3068: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8273; 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+44596+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: 653vgoxY/LVpAJ7dm8bpX7qPuWvx2A37sFzr21+0rUGDegohGbrihFIPP6cisCPFG6oMXjVUuRKh58hbZpHXfJL4k/6xiUnn4uIE4Xu4G/Vo15MEQpqIMc0ZHh/Udu/etZSsMdvXd3GfoZaWzcPvkV606d4427PS0LnmGd7o5uG2V4EgOsXRBDTwwAE7t33Lkf3csKu3nbtz2aDxCJxrNWJ6W1hRZtuf0ZOj43GSHOhGBTBT3RSY6leIDiFUIUl+geWGoqFfM8uSAEhdB/wJA7CcfLnCc8Snh9lhOPRUlKnlfW97GlJySVIrJzN50i+7hJ0dCLfuMr4PsY5TQ5KV4bFpL0EJWzDTYCKwPUIgWSugpC5iqrdkDpSQf0ZA0WFMiiHaFS1bKMPEmzBQYd/m93tkkRLhbfwkzHS0l2QuTe4= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 67b9ec15-5eae-4339-89d6-08d714c6322f X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jul 2019 08:16:17.7908 (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: DM6PR18MB3068 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=1564474755; bh=d1MOlxUlo6kXTYFPND2FRR7+ta3Gxgn6j8WG2BRgxrk=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=ZQB4fdJ8VXoMID11iiGjOiJqM9gPJappztfYLqMLX/bmRbS4qsTSt+sH1N+nvz6Jpdt ofkDagKxUXT+PE8We3InM7oJdabkeBKSCIGmLO2OTfWnvMeUpt0tlguW5K/LUnJP0Kl0k sRFK2dG6F7c04wCXPZhbIxaE92pzf8QrS2k= 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. * RegisterBootOptionHotkey() only uses EFI_INPUT_KEY from EFI_KEY_DATA, so we don't need to use EFI_KEY_DATA for F2 and F7 in RegisterStaticHotkey(). v2: Update the description for the removal of EFI_KEY_DATA Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-by: Michael D Kinney --- 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 195b3f3097..7b0c2ea336 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 (#44596): https://edk2.groups.io/g/devel/message/44596 Mute This Topic: https://groups.io/mt/32651920/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 Sun May 5 12:05:52 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+44597+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 1564474758594912.6385264016618; Tue, 30 Jul 2019 01:19:18 -0700 (PDT) Return-Path: X-Received: from m9a0003g.houston.softwaregrp.com (m9a0003g.houston.softwaregrp.com [15.124.64.68]) by groups.io with SMTP; Tue, 30 Jul 2019 01:19:17 -0700 X-Received: FROM m9a0003g.houston.softwaregrp.com (15.121.0.191) BY m9a0003g.houston.softwaregrp.com WITH ESMTP; Tue, 30 Jul 2019 08:19:14 +0000 X-Received: from M9W0068.microfocus.com (2002:f79:bf::f79:bf) by M9W0068.microfocus.com (2002:f79:bf::f79:bf) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Tue, 30 Jul 2019 08:16:21 +0000 X-Received: from NAM03-CO1-obe.outbound.protection.outlook.com (15.124.72.12) by M9W0068.microfocus.com (15.121.0.191) 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; Tue, 30 Jul 2019 08:16:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YYjGFPjzL7pQbVvpiRxVsMcHeSzrjIAaKt0KNFXxSMlRyCVo0HUyo3s484PiC38wRoZ4+cEmoGDsDWzpb5moqUZ1or3jqgYUzlsyP3yaOBSgdhj/B6WNPILe7UC83fna7gYWtPrIFevjj+GGKxhLClQKb2ImEsW1NyKx/cotPr8quy5gBu6Ud8QH/B8TZSgFkuIRrQEQfC4UD+RLIoS+exmY7dJEJYppEIJuSNXbzgE+HmqGRYHGsD8SwHFAh/XrBUoI4ZA4SSVUj9HOU5nOvqNyE7b1G4sOCB+n83wzjnK7mWuS04Jq5+LAaXoBdVVJG/Nxcw8lXEoquZtNgtkv/g== 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=foFlRcI8/aXJZGN4lRPY+hR5cHuqxQoriiyb7C16lNk=; b=ONLESk5YUkvZvA5wDWe4KqRUMj95c4/kTbj9AvWFfSguC+s+hwVlpmiyrYN/+CKZpQNXNyps4TDBxKY5Wkdc5XyT1vdDwyDvIcirMp8RUgELHB3ZOsg1xUw0nO9+rLErlaCxdZGVhyRGYWJWPLWvEmrO+kq9O+oEK/MF2F+ytzc3Cto5P+GIifQP2JXC69BHKlTWKnsGNXglMpKxjrBQi9wEphWSgHEYQKk4UWZscmfZxehpW5ONFoPFmhjQqZHbecUSth2zkElc8uAWozaPrcDbcoEq5ygGaLcC8j5i6o2UDPG/NTnyUIm3LWLyTpeQa1iuzDQZVYCCR9kze0/whA== 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 DM6PR18MB3068.namprd18.prod.outlook.com (20.179.48.77) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.14; Tue, 30 Jul 2019 08:16:20 +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; Tue, 30 Jul 2019 08:16:20 +0000 From: "Gary Lin" To: "devel@edk2.groups.io" CC: Zailiang Sun , Yi Qian , Michael D Kinney Subject: [edk2-devel] [edk2-platforms] [PATCH v2 5/6] Vlv2TbltDevicePkg: Add the missing SMBIOS bits Thread-Topic: [edk2-platforms] [PATCH v2 5/6] Vlv2TbltDevicePkg: Add the missing SMBIOS bits Thread-Index: AQHVRq8RXp+ydil64E+q91miWn8GjA== Date: Tue, 30 Jul 2019 08:16:20 +0000 Message-ID: <20190730081518.16349-6-glin@suse.com> References: <20190730081518.16349-1-glin@suse.com> In-Reply-To: <20190730081518.16349-1-glin@suse.com> Accept-Language: zh-TW, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: DB6PR1001CA0031.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:55::17) 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: 57b8c537-ea00-4c34-831c-08d714c63400 x-ms-traffictypediagnostic: DM6PR18MB3068: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:248; 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+44597+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: uC2eA5aGzwajBL6OkCxgQsg67FaxQRkIQQZaygEl3Rwl72xMyka0nW+9kz7q99XiFMRpEzQXKS6hO3OurEvtnzngcayo0dYrH0+G4HkGPBfRVI0ujqpsAOZb8FmIuzsMG/lMMMNRPhDCERlf+yziUeTRdQ/eTwcqfbSeX6UtJsYAFIv8uBfEB0tpDgG+oDuvQIfRJRzYt1SvEFXE8XIkB50jjIiSB6/iVFrx6jzyZymSmab3gTYis0MSn5+S06OHjzJyV1+1CH2hV180G2JD1+MXbtqFieFJ1wuZDQblSCua7mP+AIEmFSVaQBB8mTOISt2X5QNJVsHMJHdBwx5kMiqukKhRPcK2ARze8Xtk7TeNwNFOdYEHFgp8dk4HrcufisnX/XyRWKtS2j/rx3kMj60HOQj6YTjUr1qG950AI24= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 57b8c537-ea00-4c34-831c-08d714c63400 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jul 2019 08:16:20.5982 (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: DM6PR18MB3068 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=1564474758; bh=FFrW7f70xKrSOdeAXphMkD9J5llkbNADzUBKvszsFdo=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=gQWynxQASwFbRYnTTzd3C9OPcAOLOPBlxBIC60srwdwFg7bfeAlCspu+DoVmsPYbyfp 8uaYaa9bVkF60miXMl63aNxc01SNHa9PCvEv03xRVV+5xaYulePeDzVv+aAGTWlJfrnnl SayHfsXzgGH1mIvwZG50nyp3AHWbMFvGef4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" fwupd 1.2.10 checks the bit 3 of BIOS Characteristics Extension Byte 2, i.e. UefiSpecificationSupported, to determine if the system supports UEFI or not. Since the bit was missing, fwupd failed to load uefi plugin. This commit adds 3 bits of BIOS Characteristics Extension Byte 2: TargetContentDistributionEnabled, UefiSpecificationSupported, and VirtualMachineSupported to complete the table. Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/DataHubRecords.h | 5 ++= ++- Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorData.c | 5 ++= ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/DataHubRecords.= h b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/DataHubRecords.h index f57a5a8c0f..83749709ff 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/DataHubRecords.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/DataHubRecords.h @@ -1742,7 +1742,10 @@ typedef struct { UINT64 SmartBatteryIsSupported :1; UINT64 BiosBootSpecIsSupported :1; UINT64 FunctionKeyNetworkBootIsSupported :1; - UINT64 Reserved :22; + UINT64 TargetContentDistributionEnabled :1; + UINT64 UefiSpecificationSupported :1; + UINT64 VirtualMachineSupported :1; + UINT64 Reserved :19; } EFI_MISC_BIOS_CHARACTERISTICS; =20 typedef struct { diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorD= ata.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorData.c index 91e8efc228..f564e64d04 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorData.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorData.c @@ -87,7 +87,10 @@ MISC_SMBIOS_TABLE_DATA(EFI_MISC_BIOS_VENDOR_DATA, MiscBi= osVendor) // 1, // BiosBootSpecIsSupported :1 1, // FunctionKeyNetworkBootIsSupported :1 - 0x1 // Reserved :19 Bit 2 is SMBiosIsTar= gContDistEnabled + 1, // TargetContentDistributionEnabled :1 + 1, // UefiSpecificationSupported :1 + 0, // VirtualMachineSupported :1 + 0 // Reserved :19 }, { // BiosCharacteristics2 0x0001,// BiosReserved :16 Bit 0 is BIOS Splash = Screen --=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 (#44597): https://edk2.groups.io/g/devel/message/44597 Mute This Topic: https://groups.io/mt/32651921/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 Sun May 5 12:05:52 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+44599+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 15644750034591006.5307612245045; Tue, 30 Jul 2019 01:23:23 -0700 (PDT) Return-Path: X-Received: from m4a0040g.houston.softwaregrp.com (m4a0040g.houston.softwaregrp.com [15.124.2.86]) by groups.io with SMTP; Tue, 30 Jul 2019 01:23:22 -0700 X-Received: FROM m4a0040g.houston.softwaregrp.com (15.120.17.146) BY m4a0040g.houston.softwaregrp.com WITH ESMTP; Tue, 30 Jul 2019 08:23:19 +0000 X-Received: from M9W0067.microfocus.com (2002:f79:be::f79:be) 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; Tue, 30 Jul 2019 08:16:24 +0000 X-Received: from NAM03-CO1-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; Tue, 30 Jul 2019 08:16:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YFybj84OTW0iQdpPt4GLBpkDj25PK8lfPcgIVCNA8a5hW3hiNZ+idJczMamValMBqQdMUd6fMiD1+mdl6TSDqdbXm/sgbEqBGKPSIdSfYfIujOh3uWUCHDWTNShBjeGdVHydo4KD1Dwnpyn8+izrYKhXDiZYfX2iBQnWv7Dysv8irBy56jGhaam4JxqWsW2asyysGPbq8O1yJwEFvdZ8diJxC3FU+Oy3X4itHfIZGxkKDOzWy/JatUJvAWLpn0wqIEJ/fWaCIHnMeOXcYzeIEqXKZO3xJ0KZefu0UXh7AK8MN2ZkGt25SXYaQAlGBkqp2otxnr36HpYag85e0KVXqQ== 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=M0JUxJ+H0wqN7jQw+RH96FQ9BeLO+bafxO6KJJDOul4=; b=BXAlMY/6dCsQsegmBbxybdQ1KzeiPJwFE5M2lJ0f2QnjgVqUfS9/Bd8CjUoriCkaZQdaep3zdbtXhDjeho09MfFtiWasJ+Oe3GnnM0s74Z4No8jRB0WREt317EssbsVTBEnmEK4xb4p6y5/aGU6i8DySNMjfo8EUH8z+feN5oqyvCOVWDQWgQxTN6t7EluI//K2ekTi9BmWzuPPuebh4wdUC1GYE9pDFc1ESlstr+VP6qIncZiv56ZzYAo/YX8hDzAuo8wtIFVbyUS7sw/UCSUPJhmFMxxvBrLYYm6MMQDdxxPwWO5UYkp3l63E71S/ovldciiiIYsCr5qH3Uw2Kpg== 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 DM6PR18MB3068.namprd18.prod.outlook.com (20.179.48.77) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.14; Tue, 30 Jul 2019 08:16:23 +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; Tue, 30 Jul 2019 08:16:23 +0000 From: "Gary Lin" To: "devel@edk2.groups.io" CC: Zailiang Sun , Yi Qian , Michael D Kinney Subject: [edk2-devel] [edk2-platforms] [PATCH v2 6/6] Vlv2TbltDevicePkg: Convert the device GUIDs of capsules to lowercase Thread-Topic: [edk2-platforms] [PATCH v2 6/6] Vlv2TbltDevicePkg: Convert the device GUIDs of capsules to lowercase Thread-Index: AQHVRq8TsS0hS9ZsA0SOcV5WAsPgew== Date: Tue, 30 Jul 2019 08:16:23 +0000 Message-ID: <20190730081518.16349-7-glin@suse.com> References: <20190730081518.16349-1-glin@suse.com> In-Reply-To: <20190730081518.16349-1-glin@suse.com> Accept-Language: zh-TW, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: DB6PR1001CA0031.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:55::17) 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: b33afac7-ee4e-441f-0542-08d714c635af x-ms-traffictypediagnostic: DM6PR18MB3068: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5516; 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+44599+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: 7UsIngAS6uzCUs3tb+vQssSmyVwPS1edVMIdpuEVFtmAW0Rln0r3sO7MH39z2R4M/02V/kjg48uml1PAYrnwfPOWRRkVr58mGhqjOkdS91PFvKM20afVwv/W0kL5PJNVJV503nBnNbuVWYkry8v/A+1ZmVUEfVYe/sSXJSJrUug3yegMJF/DmxDgLIYNr+xVBiFb1PbRElocY3dyUgDFGVxR7RFnSKFqAFe/n6wNQs2V/z898XhDB8LUREpCvmZL+/2nDRmdJ/XqGPhzLwV5pVVBAozhQ6LiAxMjXWjOCf1AOESPf9sQMUAzigzCru2644f7UimuQr+NQlN8XJaQxpMbJ3IHIZpbvimNqlYPBrPJAdJwW7V6S3PAAjN1cwFvCX6KHqSsyZy8N1G2zcDL4T1RKXkHybIPtdPUqzFkzSQ= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: b33afac7-ee4e-441f-0542-08d714c635af X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jul 2019 08:16:23.6565 (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: DM6PR18MB3068 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=1564475003; bh=qTL/mlz4Vp3+8iIrHbfJW+dfWWbEOma4q/Q9akmMkaA=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=QFqLrm2OW6A4jrRvnGRZHy+kn9sT6ze5R1ff8CHJ3nT8aqxsqHE2XMLxwrcuyJc9kwV HXu2+UIjuq4cDA5nw5UhUyrE65XqwGC5WraKna4RE5TEUp8TvBF9kuFo56kUr0a2kSHFf vjO2zJAK9LhBIazFrDdu1rDReuShetYifxI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" LVFS assumes the GUIDs in the metainfo.xml are lowercase, so fwupdmgr may fail to match the devices. Convert the GUIDs to lowercase to be compatible with LVFS. Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsul= eAll.py | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsu= le/GenCapsuleAll.py b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Gene= rateCapsule/GenCapsuleAll.py index b2fd65a6c6..a37648ac96 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC= apsuleAll.py +++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC= apsuleAll.py @@ -370,28 +370,28 @@ if __name__ =3D=3D '__main__': # # Generate capsules for the Red Sample Device # - GenCapsuleSampleDevice('Red','72E2945A-00DA-448E-9AA7-075AD840F9D4',0x= 00000010,0x00000000, CapsulesPath, CapsulesSubDir) - GenCapsuleSampleDevice('Red','72E2945A-00DA-448E-9AA7-075AD840F9D4',0x= 00000011,0x00000000, CapsulesPath, CapsulesSubDir) - GenCapsuleSampleDevice('Red','72E2945A-00DA-448E-9AA7-075AD840F9D4',0x= 00000012,0x00000000, CapsulesPath, CapsulesSubDir) + GenCapsuleSampleDevice('Red','72e2945a-00da-448e-9aa7-075ad840f9d4',0x= 00000010,0x00000000, CapsulesPath, CapsulesSubDir) + GenCapsuleSampleDevice('Red','72e2945a-00da-448e-9aa7-075ad840f9d4',0x= 00000011,0x00000000, CapsulesPath, CapsulesSubDir) + GenCapsuleSampleDevice('Red','72e2945a-00da-448e-9aa7-075ad840f9d4',0x= 00000012,0x00000000, CapsulesPath, CapsulesSubDir) =20 # # Generate capsules for the Green Sample Device # - GenCapsuleSampleDevice('Green','79179BFD-704D-4C90-9E02-0AB8D968C18A',= 0x00000020,0x00000020, CapsulesPath, CapsulesSubDir) - GenCapsuleSampleDevice('Green','79179BFD-704D-4C90-9E02-0AB8D968C18A',= 0x00000021,0x00000020, CapsulesPath, CapsulesSubDir) - GenCapsuleSampleDevice('Green','79179BFD-704D-4C90-9E02-0AB8D968C18A',= 0x00000022,0x00000020, CapsulesPath, CapsulesSubDir) + GenCapsuleSampleDevice('Green','79179bfd-704d-4c90-9e02-0ab8d968c18a',= 0x00000020,0x00000020, CapsulesPath, CapsulesSubDir) + GenCapsuleSampleDevice('Green','79179bfd-704d-4c90-9e02-0ab8d968c18a',= 0x00000021,0x00000020, CapsulesPath, CapsulesSubDir) + GenCapsuleSampleDevice('Green','79179bfd-704d-4c90-9e02-0ab8d968c18a',= 0x00000022,0x00000020, CapsulesPath, CapsulesSubDir) =20 # # Generate capsules for the Blue Sample Device # - GenCapsuleSampleDevice('Blue','149DA854-7D19-4FAA-A91E-862EA1324BE6',0= x00000010,0x00000000, CapsulesPath, CapsulesSubDir) - GenCapsuleSampleDevice('Blue','149DA854-7D19-4FAA-A91E-862EA1324BE6',0= x00000011,0x00000000, CapsulesPath, CapsulesSubDir) - GenCapsuleSampleDevice('Blue','149DA854-7D19-4FAA-A91E-862EA1324BE6',0= x00000012,0x00000012, CapsulesPath, CapsulesSubDir) - GenCapsuleSampleDevice('Blue','149DA854-7D19-4FAA-A91E-862EA1324BE6',0= x00000013,0x00000012, CapsulesPath, CapsulesSubDir) - GenCapsuleSampleDevice('Blue','149DA854-7D19-4FAA-A91E-862EA1324BE6',0= x00000014,0x00000012, CapsulesPath, CapsulesSubDir) + GenCapsuleSampleDevice('Blue','149da854-7d19-4faa-a91e-862ea1324be6',0= x00000010,0x00000000, CapsulesPath, CapsulesSubDir) + GenCapsuleSampleDevice('Blue','149da854-7d19-4faa-a91e-862ea1324be6',0= x00000011,0x00000000, CapsulesPath, CapsulesSubDir) + GenCapsuleSampleDevice('Blue','149da854-7d19-4faa-a91e-862ea1324be6',0= x00000012,0x00000012, CapsulesPath, CapsulesSubDir) + GenCapsuleSampleDevice('Blue','149da854-7d19-4faa-a91e-862ea1324be6',0= x00000013,0x00000012, CapsulesPath, CapsulesSubDir) + GenCapsuleSampleDevice('Blue','149da854-7d19-4faa-a91e-862ea1324be6',0= x00000014,0x00000012, CapsulesPath, CapsulesSubDir) =20 # # Generate capsules for Minnow Max Firmware Updates # RomFileName =3D os.path.join (EdkiiBuildOutput, 'FV', 'VLV.fd') - GenCapsuleDevice('MinnowMax', RomFileName,'4096267B-DA0A-42EB-B5EB-FEF= 31D207CB4',0x0000000C,0x00000000, CapsulesPath, CapsulesSubDir) + GenCapsuleDevice('MinnowMax', RomFileName,'4096267b-da0a-42eb-b5eb-fef= 31d207cb4',0x0000000C,0x00000000, CapsulesPath, CapsulesSubDir) --=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 (#44599): https://edk2.groups.io/g/devel/message/44599 Mute This Topic: https://groups.io/mt/32651933/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-