From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.6084.1634624066437348401 for ; Mon, 18 Oct 2021 23:14:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=T4di968q; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: zhiguang.liu@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10141"; a="215356510" X-IronPort-AV: E=Sophos;i="5.85,383,1624345200"; d="scan'208,217";a="215356510" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Oct 2021 23:14:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,383,1624345200"; d="scan'208,217";a="719909139" Received: from fmsmsx604.amr.corp.intel.com ([10.18.126.84]) by fmsmga005.fm.intel.com with ESMTP; 18 Oct 2021 23:14:24 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Mon, 18 Oct 2021 23:14:24 -0700 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Mon, 18 Oct 2021 23:14:24 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx609.amr.corp.intel.com (10.18.126.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Mon, 18 Oct 2021 23:14:24 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.173) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Mon, 18 Oct 2021 23:14:24 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hJFvmuYqhRZhahiewv77J+HJlleJQA6R2heWHxzBigcNC0rWDDiwVTXT0KZ8FK+k3Wy6A6d1bq2DbVHOF+EekByjWSbF7G3+9qExXjutYlnvdGpriCJPx3uugczRvlScENAOU80Tv7kEUyA/TZgeoVnVQFfZXFQCbVF2IRLz3XyFRLyKmhKeEjFlOGss95Y+i8CQuUhUVuEzMtYL/qgk3tRDNH/5FE4r+hCIrc1/56AeV4gmu4srqmcAKCWPQmhPKpvU+D5IL5XI6Pt+10QRaE29VGbOJtKWx7SBJOivL8rGFH1rDzOnhK/wMkekmlssHKgnAszSN+4b0NkmmwCRcQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tzpN6K0QwC3DOeOGpFofzUtg6y3VbfIwafX4A5ggnBQ=; b=Zl9ZZ1JDk6YowXyBPRDVnNzr7Pbuv6ACKrNE+FEsNgVvgajJHBkVpMmLZOcLKkZwRlgaS4lFM+CP3d1bCgaThGm0dDo05WNoigWVTEa5MBH66yQLj8iqhCp0WOVuY48q3ZgRiFP9l6IKfdxRshSONREubpBq6wjqxNHys8ZuI9yXk7LImTrhbrzhiM1NnP9ioirJOKcBGWR6D3O5ZCjh7DuMiYSx+kVSge8heoSiE2vtwhbFolFnyW1jBKs8s3pwN4e5dXuTGgCPe1v+u2xmPyh9DycZW+n2Z6Mx08wyknPOdwpKjH2QR2LfT7pfviwaJin1UHMp7dZwvRWssRQM2A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tzpN6K0QwC3DOeOGpFofzUtg6y3VbfIwafX4A5ggnBQ=; b=T4di968qCOCTXaDDt+dZ60qSJUmF6eaOtmpD4hFJlfsy+cVip2ZuAh7Fnoq1AESdvsvF+i3TO9KLLe/d778Aikp7KKUlNqK3Quz7/LJpV07bXh8kQ/QiRxhnMGxn6W3zhM3+btoQsQZ2pnmkGiSP2FaTrmisJisaM/VU8+QIfv4= Received: from PH0PR11MB5048.namprd11.prod.outlook.com (2603:10b6:510:3d::14) by PH0PR11MB5109.namprd11.prod.outlook.com (2603:10b6:510:3e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Tue, 19 Oct 2021 06:14:23 +0000 Received: from PH0PR11MB5048.namprd11.prod.outlook.com ([fe80::10c8:3ad8:c20c:bfa0]) by PH0PR11MB5048.namprd11.prod.outlook.com ([fe80::10c8:3ad8:c20c:bfa0%4]) with mapi id 15.20.4608.018; Tue, 19 Oct 2021 06:14:23 +0000 From: "Zhiguang Liu" To: "devel@edk2.groups.io" , "Dong, Guo" CC: "Ni, Ray" , "Ma, Maurice" , "You, Benjamin" Subject: Re: [edk2-devel] [`edk2-devel][PATCH] UefiPayloadPkg: Fix the build failure for non-universal payload Thread-Topic: [edk2-devel] [`edk2-devel][PATCH] UefiPayloadPkg: Fix the build failure for non-universal payload Thread-Index: AQHXxK+/Ld0epI6k80evhbWxxe3a6KvZ13o2 Date: Tue, 19 Oct 2021 06:14:23 +0000 Message-ID: References: <20211019060809.598-1-guo.dong@intel.com> In-Reply-To: <20211019060809.598-1-guo.dong@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: suggested_attachment_session_id: 1552e6cc-0dc0-a26d-3b7d-b5d05297e721 authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 591b1ae6-1cbe-4f6a-043e-08d992c7b20a x-ms-traffictypediagnostic: PH0PR11MB5109: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2887; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: MK2vu/OA0Qk2twXEBsH9vcFUJYdn2ekYYHFwDNO3WJrCSF+rYnIU/h1fb3RmdekxMokajF8+ttZQN14TD7HxLsovun75gZ4Zw1I8I1sAdB9yY1r2UaM1bWM7pvGp9w0/lrVGlMQDaq49ZQKJUYqOBF8yeayZqA0eOhtLxQmZ6BDxqn97mKyiDlTJH4GhpdfslmU//wnJIWpVyYVNwXM7xsJM4z54d7hqYEeVqD/yS4NgkuoJe5/+/88uLb6C+URS7lTgN7QyZ1vqvWhaJy+SWulUAgO6+84RycZnS4SXcSJ3eMTqbLKCFW+pe/rHcKuIykxe8JyPhOnuiRDSkDwpeQ6pOss9qAH0MPyWZ1wlxI2Q87EYLNVyM4CUGD/vb852y9whrjB1PFoMklNjnyVMOiVu/UZrgTNZ4+nxt8hk9XdPA6iWP2zdLYPLOnvWFIy4xYc7lQYA8/5RSLFcAOHw2VD7dC5v6m+Aaavh9RPjiLcd8OGrdJH+1pIjINKdN1778a/YF84oFUwQZKKGgZVRx3qYx0oSWzuGbPGETypTSZe1cCOjPqkf+c4qJKl1NGdBROEgWVQP+PmuIgl6+BMzMK4AyknLhy2EB19FrCoNH5RMjfXuXWp6+4ngrY2/0cLYWDhUcSYWRJ8PiG9xuQ5sjyaZOtGceFFffCTyvlNeQkcPAJlLGY3nAR6kHDvhKGoKVKlmeLJ96rki6jdXXgihGi/R4bhbbB4/c8qXSKQdLJYaZvAif4rwwIVgoTpZizDE/oiN+bsRlbz1T7QSnZy7JzkPupCZGrQU0lFmLG7exppfCRyA1t13wZ0F1YB/Msry7G16NVyO6NZrMBa7QjKH1z1gV5r0vVvHIR4nxTR9pFs= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR11MB5048.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(316002)(38100700002)(83380400001)(122000001)(71200400001)(6636002)(38070700005)(55016002)(19627405001)(5660300002)(110136005)(4326008)(166002)(53546011)(8936002)(966005)(76116006)(91956017)(2906002)(8676002)(9686003)(6506007)(54906003)(64756008)(66476007)(66556008)(66446008)(86362001)(66946007)(7696005)(33656002)(107886003)(82960400001)(26005)(186003)(508600001)(52536014)(81973001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?geVCzOdmXvmx5ibjCSjcosdiclZ2zCBkrSP1M/ZHtVE3YhfAt4gBeWDpWJ?= =?iso-8859-1?Q?uTmWEXtrXaGWJXoYFnq2+48loOFs09bdPhKRBms7/LYRzb2SaadHnrP1Ft?= =?iso-8859-1?Q?CqJtIt2sQPLD+5lgWkjep2II/Ral63Hj8+NAUayZHUDrREgLWcJqkgiuK1?= =?iso-8859-1?Q?6i811V5oWrPUGt4NxnWNmYzg7Bu4SmcAooUvvoEe5YV43N7Xy/NTfewy2v?= =?iso-8859-1?Q?GrDLGYKb9JuoNsuavMhMzEpPfrdrWg2d6GcHb1AIqDgdkKLIbHHwXIteeO?= =?iso-8859-1?Q?I4EQ3h0jDtCUCU17YXTyPwVztskp5BePJV/GX33fc3e9Sp8N8+ruPKvIhU?= =?iso-8859-1?Q?Rse/kiWxx/4apJZbfP826KQQwgrIcwH5MezKUL4sChpB9RylCg0tyqY0b7?= =?iso-8859-1?Q?J5bSTzxF6XK+IS7ztNZE6zjnmDs81+7WsBHj9G0n8tEUxGQX1VhBcNQ8AR?= =?iso-8859-1?Q?h8hLgSh3x6j3n4GMPKlF0nWjfBwGK0EGRkzh1OTaNFHA8VNcERJlKsHhvN?= =?iso-8859-1?Q?3xEwbhJq557/2YvIaX4cZrbJshuz37UTKSjnVjmE6Bn2eQW3h3hgbN4u4n?= =?iso-8859-1?Q?VqRYAg0azmq3fpSQ9B1fblDm0UlICketXf/11C9+vvXJpV0r9UTxrAmDLb?= =?iso-8859-1?Q?oBvINv48vWlhwepC4JzpwsJVWWSUJmWdaWID/NscIKdTCwnKQWB1EDjugW?= =?iso-8859-1?Q?IMDnTrwEOEXn/+lHmQNPXvrCgsGpJyJNYonlpZ8shmAtvafaLB5XJBGDVh?= =?iso-8859-1?Q?h3ECkKGxCuJtf/7nYz/Ug9wEmdeRYQQaZXHGa3nnmr76y/Ldl89nUIwZex?= =?iso-8859-1?Q?hWyZCzbZVLDWrLyYfqrsyMBupDcAYOfp1uP6mfXNo2B+aJZ9K2lUkVqe8k?= =?iso-8859-1?Q?uybU1H+3dngqyJetZv+TcG0L96fm6ZDhgnSEW41yuCK/Z++ZvBjQ322f3e?= =?iso-8859-1?Q?OYqAMyzctekBMkqNp9/VYEzRie6vvp7asQr955JoM4gLBHb3ghsfQsddfB?= =?iso-8859-1?Q?Dj+D8H088M1UCULYh6c+NEWsOSCoUNuSXGjUUVcOqo4kQEMfIlzPQvBrYU?= =?iso-8859-1?Q?MsZvof43qvT3kHtRMp3m+FTiUwSAdZ6BzhK20uhfvinrOW8oGAqXiXK4Bl?= =?iso-8859-1?Q?Yzlq5Ngv1ubEDK81xjKYlQr0VM6Wv1mMZy5UUJKS016yVetk0GyUOHFV1U?= =?iso-8859-1?Q?MRdTWsF9EFTKVojh9cK0KsfyhNl5PQQinBXFi9aUVIOUyIwhSkInyjbP8G?= =?iso-8859-1?Q?SmherfsUG7AIWAvvD/sQhA3/tk9AJuSfDA3wkiRzrnCuqW2+WMnMfWPvE1?= =?iso-8859-1?Q?DMXg7i+pfb5FZCcBf7CP3ETaxt3Men6i7/BH2Nb2jqdSkWVH1L5Q9i47HX?= =?iso-8859-1?Q?CGO1OX0kAp?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5048.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 591b1ae6-1cbe-4f6a-043e-08d992c7b20a X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Oct 2021 06:14:23.1021 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: fjSIUmOhgYQP+/7BRVLboj7XBRwb3MLJucG43B9WGI1kSxBOfAlnf0f/hsSjpk+0T4W2MQKCZ+xMh9w1Kur+iw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5109 Return-Path: zhiguang.liu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_PH0PR11MB50484B8CB12420BE0C24178790BD9PH0PR11MB5048namp_" --_000_PH0PR11MB50484B8CB12420BE0C24178790BD9PH0PR11MB5048namp_ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Reviewed-by: Zhiguang Liu ________________________________ From: devel@edk2.groups.io on behalf of Guo Dong Sent: Tuesday, October 19, 2021 14:08 To: devel@edk2.groups.io Cc: Dong, Guo ; Ni, Ray ; Ma, Maurice= ; You, Benjamin Subject: [edk2-devel] [`edk2-devel][PATCH] UefiPayloadPkg: Fix the build fa= ilure for non-universal payload From: Guo Dong Applied an old patch which caused non-universal payload build failed since that code was added after the old patch. This patch fixed the build failure. Signed-off-by: Guo Dong Cc: Ray Ni Cc: Maurice Ma Cc: Benjamin You --- UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c b/UefiPaylo= adPkg/UefiPayloadEntry/UefiPayloadEntry.c index 00db65c2f0..9efe01d094 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c +++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c @@ -103,7 +103,7 @@ MemInfoCallbackMmio ( **/ EFI_STATUS FindToludCallback ( - IN MEMROY_MAP_ENTRY *MemoryMapEntry, + IN MEMORY_MAP_ENTRY *MemoryMapEntry, IN VOID *Params ) { @@ -168,7 +168,7 @@ FindToludCallback ( **/ EFI_STATUS MemInfoCallback ( - IN MEMROY_MAP_ENTRY *MemoryMapEntry, + IN MEMORY_MAP_ENTRY *MemoryMapEntry, IN VOID *Params ) { -- 2.32.0.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D Groups.io Links: You receive all messages sent to this group. View/Reply Online (#82287): https://edk2.groups.io/g/devel/message/82287 Mute This Topic: https://groups.io/mt/86433746/1779286 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [zhiguang.liu@intel.com] -=3D-=3D-=3D-=3D-=3D-=3D --_000_PH0PR11MB50484B8CB12420BE0C24178790BD9PH0PR11MB5048namp_ Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable
Reviewed-by: Zhiguang Liu <zhiguang.liu@intel.com>

From: devel@edk2.groups.io = <devel@edk2.groups.io> on behalf of Guo Dong <guo.dong@intel.com&g= t;
Sent: Tuesday, October 19, 2021 14:08
To: devel@edk2.groups.io <devel@edk2.groups.io>
Cc: Dong, Guo <guo.dong@intel.com>; Ni, Ray <ray.ni@intel.c= om>; Ma, Maurice <maurice.ma@intel.com>; You, Benjamin <benjami= n.you@intel.com>
Subject: [edk2-devel] [`edk2-devel][PATCH] UefiPayloadPkg: Fix the b= uild failure for non-universal payload
 
From: Guo Dong <guo.dong@intel.com>

Applied an old patch which caused non-universal payload build failed
since that code was added after the old patch.
This patch fixed the build failure.

Signed-off-by: Guo Dong <guo.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
---
 UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c b/UefiPaylo= adPkg/UefiPayloadEntry/UefiPayloadEntry.c
index 00db65c2f0..9efe01d094 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
@@ -103,7 +103,7 @@ MemInfoCallbackMmio (
 **/

 EFI_STATUS

 FindToludCallback (

-  IN MEMROY_MAP_ENTRY        =   *MemoryMapEntry,

+  IN MEMORY_MAP_ENTRY        =   *MemoryMapEntry,

   IN VOID         &= nbsp;            *Pa= rams

   )

 {

@@ -168,7 +168,7 @@ FindToludCallback (
 **/

 EFI_STATUS

 MemInfoCallback (

-  IN MEMROY_MAP_ENTRY        =   *MemoryMapEntry,

+  IN MEMORY_MAP_ENTRY        =   *MemoryMapEntry,

   IN VOID         &= nbsp;            *Pa= rams

   )

 {

--
2.32.0.windows.2



-=3D-=3D-=3D-=3D-=3D-=3D
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#82287): https://edk2.groups.io/g/devel/message/82287
Mute This Topic: https://= groups.io/mt/86433746/1779286
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.= groups.io/g/devel/unsub [zhiguang.liu@intel.com]
-=3D-=3D-=3D-=3D-=3D-=3D


--_000_PH0PR11MB50484B8CB12420BE0C24178790BD9PH0PR11MB5048namp_--