From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.81756.1629447096697635914 for ; Fri, 20 Aug 2021 01:11:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=XH1XmtrG; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: ray.ni@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10081"; a="238859610" X-IronPort-AV: E=Sophos;i="5.84,336,1620716400"; d="scan'208";a="238859610" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Aug 2021 01:11:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,336,1620716400"; d="scan'208";a="595202215" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga001.fm.intel.com with ESMTP; 20 Aug 2021 01:11:35 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Fri, 20 Aug 2021 01:11:35 -0700 Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Fri, 20 Aug 2021 01:11:34 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10 via Frontend Transport; Fri, 20 Aug 2021 01:11:34 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.177) 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.10; Fri, 20 Aug 2021 01:11:34 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SwmUCADkpccqQ1PgES9/5VpAElYJOmXsLYhuVf7m4iYBlBWDHrwf91qpFdTbhKHHTz1i6Ypm3tVsVuy3mGxhpAc24dy16O3hfpu0eTkdEfdVWaXCSlZxv3tBljjgS6wDxQ1ocMvYA46GNtIP1XG1dijuz2rWKQJ/33CqvrS3lp6OrUZwFgk213F3f7fJoSmnz41vw6LdJkKoH5ZwcmUZgPmY1x0ht7ToxG6/Owrs1YQyGpaaCH5UkFi7pxPHzupHPVgZfU8wtylgj2sUDyeZh461ripHqDwZnYMXXmEYVkLCHEv19GpPxk1nD4PSQFPJCstEOSaRYWWgQNvlNtnnDQ== 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=GyMWQB7A+T2t+Pgn79Rugwm/LIn2ZzFCM1+U8rtvfmY=; b=ndEWRZjPhkD14TeGAKO85uElxpx+HYNoNQ3Du43Cb2Dy2nDKTufmhKcE2eXISYdZKzSVGU0qD8sCoyx4P3Rp8YS44xZux5WeDnCbiPtVzI/3djuu7jp6g84QHg2CPuACabGfJY/yZsFN2rfCQvmjuh0ffZpea1dVvc8j+4I7rHeK9inIyLt3vW0lnbqDXq+I9PFiMK6HyaaDX4aC2pR3NgrCXD41EF47s8wOfHrHSL/ebkNUjsxdRaYx3N+xR8YdfwdviLkQHJaE6yI5a56O4FGcexqX6Ow87vj+Gm4ukRYexvDLE0ABWuwuZFeQ4PI1g4mryDoTZNv34tmo2tMXog== 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=GyMWQB7A+T2t+Pgn79Rugwm/LIn2ZzFCM1+U8rtvfmY=; b=XH1XmtrGYlFkcvwVV6coVxFkxPstAi45ViH6rtdVoGa1GGW5rhhmlvl3lGq9pHCp6khoWGp1kLDk5NOJ/lpUWitC11aatf8cYIYb8jr1OWgJ/G6ka8lWaQ8D/fEhlQWk1c3CvP/5EkuaHxXGPWjcil84gtHlrYHXDcR3dDjj2N4= Received: from CO1PR11MB4930.namprd11.prod.outlook.com (2603:10b6:303:9b::11) by MWHPR1101MB2224.namprd11.prod.outlook.com (2603:10b6:301:52::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.24; Fri, 20 Aug 2021 08:11:30 +0000 Received: from CO1PR11MB4930.namprd11.prod.outlook.com ([fe80::c98d:a1f9:48a8:8865]) by CO1PR11MB4930.namprd11.prod.outlook.com ([fe80::c98d:a1f9:48a8:8865%6]) with mapi id 15.20.4436.019; Fri, 20 Aug 2021 08:11:30 +0000 From: "Ni, Ray" To: "Tan, Dun" , "devel@edk2.groups.io" CC: "Dong, Guo" , "Ma, Maurice" , "You, Benjamin" Subject: Re: [Patch V2] UefiPayloadPkg: Fix the build error when enable Core ci for UefiPayloadPkg Thread-Topic: [Patch V2] UefiPayloadPkg: Fix the build error when enable Core ci for UefiPayloadPkg Thread-Index: AQHXlZQM9UKLDhIgH0KoJlaHzAWZ36t8Cr+Q Date: Fri, 20 Aug 2021 08:11:30 +0000 Message-ID: References: <20210820072040.346-1-dun.tan@intel.com> In-Reply-To: <20210820072040.346-1-dun.tan@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.100.41 dlp-reaction: no-action dlp-product: dlpe-windows authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ad9e6127-8e48-4918-9c3b-08d963b21db7 x-ms-traffictypediagnostic: MWHPR1101MB2224: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6790; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 1rSxEZD5UQuu3gB43bmROY9jgY0YfU2b0FralnIA8fFaR6w5hnSjzQjP7G9P8Thaw160BEI/gVdvSEXj5WmR45CVRA/ct6ShVmbrkq+GRoKL/ZMys0YGPx9rWvxWYse6wqS82Sl7iMykJnofdDzZLktbGXDd73iTU0vGFXMLoHWGCdSNmgB2v0UKGA0jxYlO1Cz2FrEixrpN8G9TgqM95QE8rYPKhgQDT1BOPMhl6qtCPCRKh+vhJclQjqKSMY1GUSkAg+IpthsS+NTn0VEQhPvuidJ31GkwlpDIxv1r4SgZzpVQYHYCEpTigMhcRCcXfwoPZvcLXsO4ICc8vpjvspFmP9LaT/Hr5EI0SFjFvneu9fDHicse5APtSmjpZ2Hu8XrdiWvSrd86jppWhAHg/LSi89yDdAkX/KjBIA/WM/2Z0mEtuAcC3AFKPg0Jmu2Wr6PaCJie5ulV30TIQAlG7ZqpwYlpL8fC3kmkJZDiT77E3bZl7S1ZqACcs0ULBMD4UYpQ4UGIRrdhaE7Lt0E0yRrFJJcb8OE13f9fcQMUJtA3afn6VXntPp39J68UzAqbhliZV+u2RUuG56r852zW5wFWSu0qJsOoqjKjEBo1VU3P3Jsr8hk2fmqVdQrSaGjVP5RCqwLuJ06qUxsCOUGmjT3Cv/vmqO4UN5eW9+nrxyIDYHUAbD4Sj2VYpaz93f6hMCvp3TuYUin+WyXjdLRuyg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4930.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(66476007)(66946007)(64756008)(86362001)(7696005)(66556008)(66446008)(83380400001)(26005)(186003)(71200400001)(9686003)(76116006)(53546011)(38070700005)(4326008)(55016002)(6506007)(107886003)(38100700002)(316002)(5660300002)(33656002)(8936002)(2906002)(54906003)(110136005)(122000001)(52536014)(8676002)(508600001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?VjtP+MbsjzTqh1xRbpI4c32Ra02rp0FhITsaMwYDm47PZ2SkM/eAOU8aJ4Fp?= =?us-ascii?Q?PeaINVfE/VF1GJUu7/EVFA+jg/39tMUXeG2Xo/hCgs9ahlNuPFjvWKNTyNP4?= =?us-ascii?Q?BmAsztsHmNJWtZqWq9aGx3lOHBQAFBz5K47LBBYJVtBtEMhnunfJxPb5JDNj?= =?us-ascii?Q?4kMX7La9GlV5DyphZxkX5h4TYpyJxCzOVuWmVgGBoIFHxeb7o8ebWK7G68E0?= =?us-ascii?Q?ToGOpmTs9k/aN1Qw94Tf/oOeRzL6L9PA5RHBJ6DO4Lyo9B06xl3+rzH4ChvN?= =?us-ascii?Q?UqRPwz0nYf23eual2XuHscENUOz5xgM0ei3korr0nb9i6hNaUZus0AVkNC04?= =?us-ascii?Q?XPEV0VKikNcfNrUk5OjN/Ms0RfAvcRkEdYK3hETt5fvObrLZv8Mmkd/d62gZ?= =?us-ascii?Q?vZh6Cc/a1mFst2wHMAMJ3kgPjQ8GrkB2kFIkTSchZ8z6T2jWFdP5Vdaf+vQj?= =?us-ascii?Q?28WW1EIr9FLhGl+SV7JL+Xkaf6FPkzpCqfH3iFPvCienHkh4A8/t/GYe2Fzo?= =?us-ascii?Q?EUcCOy5kNYDyjNSh+pmWOExck+2uWtqr4MQKdHx6CYJzkof0BTolO+J+6PFH?= =?us-ascii?Q?nqDw+U2CKTN14rsoeQr5LeHz6XDnTV6VeAozu8YD7NKqOu0VozAumy3Q3i+F?= =?us-ascii?Q?jX3N61QPEwL/54GRRnMMziSRsANNtpbqhO1MuhYyHD7rw2X2jzQL7GpYZH8U?= =?us-ascii?Q?vXziGJSHbBsmKpS9bnp2j/WRNqyqmeGMFHVjfw8IHH6nsO6R5xTPg+D5S3Em?= =?us-ascii?Q?6OAe/bDL+hk0JjrOfoxLnZA9z/Kh2cw6O+0lndznzPi1MUklOYHlUp4DLeTG?= =?us-ascii?Q?bqXsqjSg9a5JTYYDqYRvjCVkwMoZ74TInSP4/u5KuP7KzdlF14IkGBWHVkD+?= =?us-ascii?Q?qlz5TXDYF8q9Hd/GY9Mf6/zVwSiPkiQKLUJx/VuPfXO6X+WmYVfQALWzDwHg?= =?us-ascii?Q?BSqpMntFGTpqpKNcn5CQMzZlhJSPvGRELjBFCNsHLqNFNoBr/ZxSOt/jDz3M?= =?us-ascii?Q?T4qqFOw2EPWqWNaLZqG5amJVbZeT9usu6t1cbIpY/P4FuwFF9bak2SelRQdy?= =?us-ascii?Q?PJLyhl8HyEcHJ57mwUs/RxDQj08kzSsiDYneNW7CjDvzEzIGHjY6fHm5HytV?= =?us-ascii?Q?i+3k2J6x8q3ZVYpKRScTd+2xtppuGFA7syElE+/j+4zQETdFSia4Txwg1OJZ?= =?us-ascii?Q?mW2l/3oPRyxp0DJ3WTkfj4Z9C2Z7IMo12phnVAh7HUYOTr3682hxRFhEltc0?= =?us-ascii?Q?L51kLjNMz4R/1MYQTiLtq0uhJfv1blAQ+N5biq3pXTs/tO40XC05DZ1WFY9l?= =?us-ascii?Q?H6U/HSH4u5ec4qvBpNDeAgNK?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4930.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad9e6127-8e48-4918-9c3b-08d963b21db7 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Aug 2021 08:11:30.2809 (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: CBMoZKVisHKZ3mIV9iv9rzwJ0reWHYvmDm5i441eIRr1WlM9NQ/hDTkfUyE7lg6y49ufeiyD+McJs8PiJMZ30Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1101MB2224 Return-Path: ray.ni@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ray Ni > -----Original Message----- > From: Tan, Dun > Sent: Friday, August 20, 2021 3:21 PM > To: devel@edk2.groups.io > Cc: Dong, Guo ; Ni, Ray ; Ma, Mauri= ce ; You, Benjamin > ; Tan, Dun > Subject: [Patch V2] UefiPayloadPkg: Fix the build error when enable Core = ci for UefiPayloadPkg >=20 > V1: Add quotes when using $(ARCH) in .dsc and .fdf file. > The quotes are added due to the way by which Core ci parse the .dsc file. > Add UINTN in Hob.c to fix cast from pointer to integer of different size = error. > V2: Delete lines which reference ShellBinPkg.The pkg doesn't exist in edk= 2. >=20 > Cc: Guo Dong > Cc: Ray Ni > Cc: Maurice Ma > Cc: Benjamin You > Signed-off-by: DunTan > --- > UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c | 6 +++--- > UefiPayloadPkg/UefiPayloadPkg.dsc | 2 +- > UefiPayloadPkg/UefiPayloadPkg.fdf | 16 ---------------- > 3 files changed, 4 insertions(+), 20 deletions(-) >=20 > diff --git a/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c b/UefiPayloa= dPkg/Library/PayloadEntryHobLib/Hob.c > index 768c3db770..dd25ac2682 100644 > --- a/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c > +++ b/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c > @@ -77,9 +77,9 @@ HobConstructor ( > Hob->Version =3D EFI_HOB_HANDOFF_TABLE_VERSION; > Hob->BootMode =3D BOOT_WITH_FULL_CONFIGURATION; >=20 > - Hob->EfiMemoryTop =3D (EFI_PHYSICAL_ADDRESS) EfiMemoryTop; > - Hob->EfiMemoryBottom =3D (EFI_PHYSICAL_ADDRESS) EfiMemoryBottom; > - Hob->EfiFreeMemoryTop =3D (EFI_PHYSICAL_ADDRESS) EfiFreeMemoryTop; > + Hob->EfiMemoryTop =3D (EFI_PHYSICAL_ADDRESS) (UINTN) EfiMemoryT= op; > + Hob->EfiMemoryBottom =3D (EFI_PHYSICAL_ADDRESS) (UINTN) EfiMemoryB= ottom; > + Hob->EfiFreeMemoryTop =3D (EFI_PHYSICAL_ADDRESS) (UINTN) EfiFreeMem= oryTop; > Hob->EfiFreeMemoryBottom =3D (EFI_PHYSICAL_ADDRESS) (UINTN) (HobEnd+1)= ; > Hob->EfiEndOfHobList =3D (EFI_PHYSICAL_ADDRESS) (UINTN) HobEnd; >=20 > diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPaylo= adPkg.dsc > index b4a30be381..856d5ea786 100644 > --- a/UefiPayloadPkg/UefiPayloadPkg.dsc > +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc > @@ -415,7 +415,7 @@ > # > ########################################################################= ######## >=20 > -!if "IA32" in $(ARCH) > +!if "IA32" in "$(ARCH)" > [Components.IA32] > !if $(UNIVERSAL_PAYLOAD) =3D=3D TRUE > UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf > diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPaylo= adPkg.fdf > index b2cfb6b405..5871d71dbb 100644 > --- a/UefiPayloadPkg/UefiPayloadPkg.fdf > +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf > @@ -201,22 +201,6 @@ INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynam= icCommand.inf > INF ShellPkg/Application/Shell/Shell.inf > !endif >=20 > -!if $(SHELL_TYPE) =3D=3D MIN_BIN > -!if $(ARCH) =3D=3D IA32 > -INF RuleOverride =3D BINARY USE =3D IA32 ShellBinPkg/MinUefiShell/MinUe= fiShell.inf > -!else > -INF RuleOverride =3D BINARY USE =3D X64 ShellBinPkg/MinUefiShell/MinUef= iShell.inf > -!endif > -!endif > - > -!if $(SHELL_TYPE) =3D=3D UEFI_BIN > -!if $(ARCH) =3D=3D IA32 > -INF RuleOverride =3D BINARY USE =3D IA32 ShellBinPkg/UefiShell/UefiShel= l.inf > -!else > -INF RuleOverride =3D BINARY USE =3D X64 ShellBinPkg/UefiShell/UefiShell= .inf > -!endif > -!endif > - >=20 > ########################################################################= ######## > # > -- > 2.31.1.windows.1