From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web11.164.1592841928164541267 for ; Mon, 22 Jun 2020 09:05:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=jWDwTt3f; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: maurice.ma@intel.com) IronPort-SDR: MR9rnrjP4J+eOc7Bzv1k3ouPCEoIe+yzVtvboVZ9vmzHxj2QDaNE84WIoRIYbhJHK7Xb5/eI4Y vEyYSzQLQXhA== X-IronPort-AV: E=McAfee;i="6000,8403,9659"; a="228458068" X-IronPort-AV: E=Sophos;i="5.75,267,1589266800"; d="scan'208";a="228458068" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2020 09:05:27 -0700 IronPort-SDR: dww1labsdYS8KW/9xokhoLmV8xP9blm+jkjMI9L+NZO3E3LPKxBZJjlE7YOmgXgesoeZl1qj0K ztJC6FbQuzYQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,267,1589266800"; d="scan'208";a="264549299" Received: from orsmsx103.amr.corp.intel.com ([10.22.225.130]) by fmsmga008.fm.intel.com with ESMTP; 22 Jun 2020 09:05:26 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX103.amr.corp.intel.com (10.22.225.130) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 22 Jun 2020 09:05:26 -0700 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 22 Jun 2020 09:05:25 -0700 Received: from ORSEDG002.ED.cps.intel.com (10.7.248.5) by orsmsx608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Mon, 22 Jun 2020 09:05:25 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.169) by edgegateway.intel.com (134.134.137.101) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 22 Jun 2020 09:05:25 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LWpqVv084bkNzr3WJwV/QHRz5bflgP0TmyQwRmP5t6zvj7z5kLgSqTSr6DR1WGPpid2TrNcRgqvzYDpjqpyXX4emmavhtxI4ZKBZgN1rm/3JjpJvnmVN+0RaWT5KjYoqqkKG5YKREs9I+PfVHrNvzc2pRxQiATpbTUY/pYKLpmRbHKhCBAB77GRpEaiTYODfSTjJfhtPimrG7uNnQkZtFCl/GS97ldz/ZWuvvrDgnumre47q9a3zjgL2n5ffyBBuzKRdcFOYP27fAM95fUawnNWzaVCDDs3WH6zcDxyo1B9unoYQavVCTLhoQ2Ys2DaohSRYBHutEVI3ST3pfDMreQ== 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=iLAatQA5BHNtCU4RHRXxMvJEpF8H0Yczki5pS1SVg40=; b=j8ruwb4l+tTfKxGdvKe4NQ6TcsSBmJZ/23civIQYUbj03LNNffVLZH6x2aPLG4PzYZpWQueFkKnEL3fpK3is+nwN2TtxM5b5lwy0bCIhvsFM/UOilYkyCBQmderWJeDx97MvduXm9LWMd3mvpJ1zLM7O7CKW37yvJVxDP+sj8jcaKsfEksrA/rnsDI1kP3E63vBHpIWjLKn0kPVWN+p4opj9C3CiT5eaWh2OxdPG3+FySDUq/7310vJUBRhV7OZ2Y9rTD8WXbMsGq8e6HkOVbF5B6UPNX7kBng4jr4/oGVJuLI66zr0pU7qjKFHCsGNBlNV0WKKGhVMvDupkzphcsw== 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=iLAatQA5BHNtCU4RHRXxMvJEpF8H0Yczki5pS1SVg40=; b=jWDwTt3f/dSJUkIk+mBwRYxEwCtLXTEoOh7btyXAWP/kg2fLV//Dt4TbAvFKPAz5JK2djFrmAY9ms9aafcNZvI8LmJo3BMgQi7Xn1pkw3kwk24MViTdvpBXLU7RpD55EH1zVIlSx/RH8YvYfhfbrUebNbm2UIfzDXxXiDFHd6Jc= Received: from DM6PR11MB2793.namprd11.prod.outlook.com (2603:10b6:5:c0::29) by DM6PR11MB3481.namprd11.prod.outlook.com (2603:10b6:5:8::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.23; Mon, 22 Jun 2020 16:05:24 +0000 Received: from DM6PR11MB2793.namprd11.prod.outlook.com ([fe80::d43:5665:5cee:b3c5]) by DM6PR11MB2793.namprd11.prod.outlook.com ([fe80::d43:5665:5cee:b3c5%6]) with mapi id 15.20.3109.027; Mon, 22 Jun 2020 16:05:23 +0000 From: "Ma, Maurice" To: "Dong, Guo" , "devel@edk2.groups.io" CC: "You, Benjamin" Subject: Re: [edk2-devel] [PATCH V1] UefiPayloadPkg:Fix NOOPT build failure Thread-Topic: [edk2-devel] [PATCH V1] UefiPayloadPkg:Fix NOOPT build failure Thread-Index: AQHWR3HAg343XsppsEG9g/xPvzc/hqjkzuiw Date: Mon, 22 Jun 2020 16:05:23 +0000 Message-ID: References: <20200621021441.32356-1-guo.dong@intel.com> In-Reply-To: <20200621021441.32356-1-guo.dong@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [104.153.200.60] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c353698d-c261-46c7-3c70-08d816c61255 x-ms-traffictypediagnostic: DM6PR11MB3481: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2887; x-forefront-prvs: 0442E569BC x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 2Kkar9aWU5RtywWSf9z8AI4MZRco/jJ21SBvhkeIdRBWzs3k0Y6oUF9/yVTFYRqR5Hku2NMkMpwP9ojjgwL+61VcwMB9vf1VMSGp815gbLSBEQwbJY6DJFBMQ8mzyNmmSG+SVAulVeAacBeGNgShuCbJGnPA/5q9iRzdCQ/aCpiSKBhc+YO0x2WnFmyFkbn/uZAXVk9FUaaSUdwmZ+AhdUpBV5QOWmPFyUUHgbYux8WoiAYjFDGKOtnbZ0ft2fkYoXFb8YiPOTEdFFMESyxEm0K8e7kn6keXVVF3e/eqkY6UU7TEcgaEj/VW1Bby0IpY6DGs6bb23/k4Jh6qK9KmSg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB2793.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(39860400002)(396003)(366004)(346002)(376002)(136003)(2906002)(9686003)(53546011)(55016002)(186003)(6506007)(107886003)(4326008)(26005)(7696005)(316002)(478600001)(110136005)(8936002)(86362001)(5660300002)(8676002)(52536014)(33656002)(76116006)(83380400001)(71200400001)(66556008)(66946007)(66476007)(64756008)(66446008);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: rAlcObNRoyuWSRx2sos6JOdf6iWIUNSH2Fd1XflrFPVuLW10Fvk9Y62ZU6RUUCA805L2xPuOjE+awOe3hnbr8qrcoX0YnFoSLFT+qn9FnMOn7KDJoKfETcx253DmC7O18FTn7Z8WaDTUeuJShABjJToVBfApQ5JefXu5u0wqT47AXJyMD8n6COeAxNBGYK/U2hbuly4X30Vn72JZGhuqmqNHYniep/1D0fzQ0iPqH27KscTtfGkA23dsDnDQz40k1rLReSGN6f1Dn6/HHFuXL7rdhpOH+maanU6oBotBB9lMabbX/cjVoFAykejr5TQ6fRgBZuTaPM1NTRY/hALmPJZ5yb1zTf8YqrbOjkvhbQezdLSPHkkRFQvqBPaSCrivnMxQutdouTo569XivwAvqDJIIU449z2Qs07+wiC4pzG4h/1/wMslEP/+haM+86wqBkxHEMxKUP8kW3A34ZjFabSujwMzHAxf0O60wmTOgqVVTg0esxZiVxALpgPWTv8Q MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: c353698d-c261-46c7-3c70-08d816c61255 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jun 2020 16:05:23.8317 (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: luU61w30DH2YglcgaT6qqpxOgxZn1P+NaP9MqMX5vCwElSJ7mEqFbg7Q/EqGjsvbsqkuTN81WK7f0NVhMnChhA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3481 Return-Path: maurice.ma@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Maurice Ma > -----Original Message----- > From: Dong, Guo > Sent: Saturday, June 20, 2020 19:15 > To: devel@edk2.groups.io > Cc: Ma, Maurice ; You, Benjamin > ; Dong, Guo > Subject: [edk2-devel] [PATCH V1] UefiPayloadPkg:Fix NOOPT build failure >=20 > When build UEFI payload using NOOPT, it would build failure since the FV = size. > So this patch increases FV size to support NOOPT. > If not NOOPT build, there is no change to FV size. >=20 > Signed-off-by: Guo Dong > --- > UefiPayloadPkg/UefiPayloadPkg.fdf | 32 ++++++++++++++++++++++++-------- > 1 file changed, 24 insertions(+), 8 deletions(-) >=20 > diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf > b/UefiPayloadPkg/UefiPayloadPkg.fdf > index dfbcde5668..a04fcd2ec2 100644 > --- a/UefiPayloadPkg/UefiPayloadPkg.fdf > +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf > @@ -8,23 +8,39 @@ > # > ## >=20 > +[Defines] > +DEFINE FD_BASE =3D 0x00800000 > +DEFINE FD_BLOCK_SIZE =3D 0x00001000 > + > +!if $(TARGET) =3D=3D "NOOPT" > +DEFINE PEI_FV_SIZE =3D 0x00050000 > +DEFINE DXE_FV_SIZE =3D 0x00800000 > +DEFINE FD_SIZE =3D 0x00850000 > +DEFINE NUM_BLOCKS =3D 0x850 > +!else > +DEFINE PEI_FV_SIZE =3D 0x30000 > +DEFINE DXE_FV_SIZE =3D 0x3E0000 > +DEFINE FD_SIZE =3D 0x00410000 > +DEFINE NUM_BLOCKS =3D 0x410 > +!endif > + >=20 > ############################################################# > ################### > [FD.UefiPayload] > -BaseAddress =3D > 0x800000|gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemBase > -Size =3D > 0x410000|gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemSize > +BaseAddress =3D $(FD_BASE) | > gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemBase > +Size =3D $(FD_SIZE) | > gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemSize > ErasePolarity =3D 1 > -BlockSize =3D 0x1000 > -NumBlocks =3D 0x410 > +BlockSize =3D $(FD_BLOCK_SIZE) > +NumBlocks =3D $(NUM_BLOCKS) >=20 > -0x00000000|0x030000 > +0x00000000|$(PEI_FV_SIZE) > FV =3D PEIFV >=20 > -0x00030000|0x3E0000 > +$(PEI_FV_SIZE)|$(DXE_FV_SIZE) > FV =3D DXEFV >=20 >=20 > ############################################################# > ################### > [FV.PEIFV] > -BlockSize =3D 0x1000 > +BlockSize =3D $(FD_BLOCK_SIZE) > FvAlignment =3D 16 > ERASE_POLARITY =3D 1 > MEMORY_MAPPED =3D TRUE > @@ -54,7 +70,7 @@ INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf >=20 > ############################################################# > ################### >=20 > [FV.DXEFV] > -BlockSize =3D 0x1000 > +BlockSize =3D $(FD_BLOCK_SIZE) > FvForceRebase =3D FALSE > FvAlignment =3D 16 > ERASE_POLARITY =3D 1 > -- > 2.16.2.windows.1