From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web12.510.1624402286402590102 for ; Tue, 22 Jun 2021 15:51:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=iVrfvVEo; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: guo.dong@intel.com) IronPort-SDR: HLLS6SkAdvvTlF6C44DcFBhLaWaPdHnWA9jURvGWiM1n1YMBDCg4DvmBwXrCVrdcWCrmJr9qEG wacnV3RX0QkA== X-IronPort-AV: E=McAfee;i="6200,9189,10023"; a="187538161" X-IronPort-AV: E=Sophos;i="5.83,292,1616482800"; d="scan'208";a="187538161" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2021 15:51:25 -0700 IronPort-SDR: W0ZvtY9CWeXE1gW+Kg1/xhqVwnP0gr3SVuph1zzFIsj6Frs35MOTReV89erynAHDY1muGeTTLn ubWd9EFswTzg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,292,1616482800"; d="scan'208";a="487076380" Received: from orsmsx605.amr.corp.intel.com ([10.22.229.18]) by orsmga001.jf.intel.com with ESMTP; 22 Jun 2021 15:51:24 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Tue, 22 Jun 2021 15:51:24 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Tue, 22 Jun 2021 15:51:23 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4 via Frontend Transport; Tue, 22 Jun 2021 15:51:23 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.171) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.4; Tue, 22 Jun 2021 15:51:22 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DnyEw0pCrGE8v+27g3hpZfd99D738Njp+AyZy22jD3BeUZb9Fs3PFkvkL8cHWiPVTQ97Bbsm9RnA3Bp6B7VzzOQNlGPd5o0GnK02AynhUonQY9ss/RVQBVd6q/ny9zeM2rX8hH9UQO98tDF4e0CxgXtWkv5EwzcDOsmfb9FX2+kp91LEGP6aK2YStHVstcTjqJ3D/SqFEdoyMKMO2jJ/haiiwx6u3XUukewfCc+eajoE8pxMfu92fatjumH7n4q5VGFCZ6LMq174ZqBexSBR2EXtHLqZaRG/xcK5wJDTcRoZHtJyc4D0e34/IsQg+uh+cXeOs43mlgRVUe/jS8J/2Q== 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=iwCgZDTFfzJHjI4MJl+RLxEU9mAen8U5+qCSKrCyKHM=; b=Xemt4k/Sf3iDB3ZqOoScmWZlU0jpEuXqjRRUd6PdnS6TI4jYk8B0LxuV0xqXDbpvbOWNoPlLoIiscqc+cJXbHHVDlIFDe97FtOySHkpb8KefaofwcRhBysI8/M1LTliIdiq8oRsSd3LBahyyOMWHxdLwoIND/9ac6Bi9onb54yuDym8iMERu8z37lRL2CBiMwD6wWvx3C0Cn4lWu6oIeS+EY/ko/a6bGkUV05BXbyd0Nj4rTXzW0RYuzWllwReGMTZYDUDR8a9dNz/YkYoa/JMCV08wbRXwZtNEiQAUka+OfBPGdpykxvpkTpSZ89g0Be17BlJiPsn1+deL8lt/t3g== 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=iwCgZDTFfzJHjI4MJl+RLxEU9mAen8U5+qCSKrCyKHM=; b=iVrfvVEoZ7fdj3QyxU+f25QFdcUnZiCNdRocya+0WuGoE7WsoyJXJIbYBEVdKB1iznlEfqKmO635sDXuIFNxtVp5NUV3GZjVCGNv+F5QvJdhe60Kl18ITBWBGfcCG1VeQguq4x0MIJn+JXgVQ6o2Mf2hgpHCuyrQwi4jycqmxo4= Received: from BYAPR11MB3622.namprd11.prod.outlook.com (2603:10b6:a03:fe::30) by BYAPR11MB2805.namprd11.prod.outlook.com (2603:10b6:a02:c1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18; Tue, 22 Jun 2021 22:51:21 +0000 Received: from BYAPR11MB3622.namprd11.prod.outlook.com ([fe80::247b:262c:b8da:710b]) by BYAPR11MB3622.namprd11.prod.outlook.com ([fe80::247b:262c:b8da:710b%7]) with mapi id 15.20.4242.023; Tue, 22 Jun 2021 22:51:21 +0000 From: "Guo Dong" To: "Liu, Zhiguang" , "devel@edk2.groups.io" CC: "Ma, Maurice" , "You, Benjamin" Subject: Re: [PATCH 08/12] UefiPayloadPkg: Include UniversalPayLoad modules in UefiPayloadPkg.dsc Thread-Topic: [PATCH 08/12] UefiPayloadPkg: Include UniversalPayLoad modules in UefiPayloadPkg.dsc Thread-Index: AQHXZeuWbatiw8O7i0KUuKfzVWvABasgpl8Q Date: Tue, 22 Jun 2021 22:51:21 +0000 Message-ID: References: <20210620154702.2681-1-zhiguang.liu@intel.com> <20210620154702.2681-9-zhiguang.liu@intel.com> In-Reply-To: <20210620154702.2681-9-zhiguang.liu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 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: [68.104.146.79] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a4d80f63-2ee6-4043-157f-08d935d04182 x-ms-traffictypediagnostic: BYAPR11MB2805: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:101; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9Eb5TUuPj94Rrbqn8aJRISPx9/cWxHW0X0id0IDqdxS1cH20kYGrBZeG7SshbuYDlpLO8PXiJYjqKbfKd2ceakClTuTOnWmfsc4awF7fpaWcrAHuPzHTdf1Mnm/7zB4GXBKVr/3CFvgol5bM1hhLWF5SsROWupCZm3RKVv1gvDeSkOgl8tfdS2UMV1K8k6a7y1/Vyq3vTAVeSzwZ+FLsKZm7a0mlOpA5KySQtznxPLuiTsLCvs3E38wOeBLuJVcCo2ahUx51su6C8+8IZvHULvV8Y4u2RSAwSOnbUlOux56KlUavV2fqw9rUOJ/6pww2X1I7OSfzys9V9trMNlsRARMvoRPeVBN9aLVL3aFVl0FcQ3Q/wZLCvL+mvvNr7314e5H6fsDzBFqftRlVWym52YW7F56cn6q/VhW9uzNYZDbr342qg5Gh9yA4WYgtrjS3ovUoQCRmi8Hf5S1jKlMOrLhk+WVu9vNGRPZRKPplhs4hOmZpZ8d7k1R2FOUmFKlv8dgdvh8mRG7mLZLXJMxg3PNYMVxS1xsnipjZyz4iFkzHBC6nSDlcz7N8dIqWWaoTv2tkkKZCce5dhzyXCLWgdooPVLos+S0Xu1gwf8p9xHg= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR11MB3622.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(346002)(396003)(376002)(136003)(39860400002)(366004)(316002)(478600001)(83380400001)(66946007)(5660300002)(9686003)(66476007)(64756008)(66556008)(66446008)(8676002)(52536014)(8936002)(33656002)(76116006)(26005)(186003)(53546011)(86362001)(55016002)(107886003)(122000001)(38100700002)(2906002)(4326008)(6506007)(7696005)(110136005)(54906003)(71200400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?yOww5ErosmOzkh8iD0AbgNdtdIllOIR8IZXvWK/aW1XatsI4vT1Amfx/UTbQ?= =?us-ascii?Q?Ra5dyC8rfNndQ6PL5kPQ6w2zIhB2013wSApVNoqfNtTosmoAvPYJFXELr6Lr?= =?us-ascii?Q?V6XkZIV05LLLfb4MdO9zdBfrVD0Le1yq4MP4GO4QAtHXYGhfcteTqwlAeWhp?= =?us-ascii?Q?wwEACFXN+49/DVijd7mAQe50fhnMbAumIoTdSwRHFaMJylhPjoo6buTn/Z09?= =?us-ascii?Q?njigQncnxjENhSk7juyXqMxD2qig8ZMRyjRXQPu7B0QVRf17OAo/t62HFC6E?= =?us-ascii?Q?nEY9Ap7ItJl37/nQHxAqiZGAO8uSsIvikk5FV36INx0023Wyg4Wpy75n9ZKX?= =?us-ascii?Q?yQwvEPqK3O60YT3uc2ShIbgY9rsVv1LltaynSU+tOJPfJ8Q6lOgiUmQoLx9o?= =?us-ascii?Q?NbUOt0G8Xma6uKNYVyzZboJPegUaCcDNptv/KwdQKWW3DAbrdX8KIq7oVO3j?= =?us-ascii?Q?M8RGOK+KFDYUxLFYjT7E2ryalqyDJozeNRlyWjj9wxrM77iN4Jndv98mRUR6?= =?us-ascii?Q?gIUHkzirqaLTNte3qPoFPaLkX4U6SzEJXvSr6qXfL9gpziwTAFCNw/4KMrwW?= =?us-ascii?Q?6iALukozZdpoh1ntdjaokwUjqcyYvtoPcSM/7i5W/MTBf2tJdcFxG48xSpnD?= =?us-ascii?Q?p47hP5hWRkmDqGBdZ0Uo5SCB/5PMM+VEK+/g6+OfBtcLP3yvyCJa0/G/6qTh?= =?us-ascii?Q?PH4KkgV3lLidwR3v7V/cFgcD1qFfKQNrAQtIg3qqGB6MuMMfcqt/23kvgM23?= =?us-ascii?Q?pVDa/u3nfF9AaWfjLx+NV2AsD5IOUqueZAUvqPAJaV60zM4PzZ4cXIuPu3al?= =?us-ascii?Q?CXdU7N3pEYsszp84E5Jw2ZPnYaOZINreIMHdQlJKTZlDa3rnGNd/vsF7Fbpa?= =?us-ascii?Q?3SROFb+qxtKscHWP1DxuUykiBY/S/NgAxpHDhDE3ry7lyev4CGMZgkuI9ZRx?= =?us-ascii?Q?gOl4mIUXF8or5mTlQkpo3UHuyb3Ll/8VvbTsc+Bhy9MG5yIaaPxbTft1U1dT?= =?us-ascii?Q?d+q/ykrIxlWaHZbtinnQCXK4B0+u826Pl3fMRo5y4xHQn9u2txV4Le3x0Xx6?= =?us-ascii?Q?8oVaQ6PiIWKStJ9NQBdYdcMogkHjiR5RsZXdk4GnhE4k8SpuIm1eUm3Zwh6S?= =?us-ascii?Q?sT8+H6Z4hx1UAG/TpcoVLyfXfD1BSUJ+cCPvVsIbg/2OgSh6Wt65uGlFNYfb?= =?us-ascii?Q?pRErRlnywNzUOGAVoEXHyYxlGZsEf4aPXkk3YLrl4jpYQFCMshm8iNNbw0yZ?= =?us-ascii?Q?ZPUU/4N+cjSHcSthRc781BcjtR+yKkTw46KVVlGkU60pCjTnIyh/LKqzzTpR?= =?us-ascii?Q?03vm63aXynWoHUZG8SOGStx/?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB3622.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4d80f63-2ee6-4043-157f-08d935d04182 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jun 2021 22:51:21.6780 (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: RNFvR00EJrxN3rfahdu98879CI9yp1cMHuI2ktepb+Acrg1rzRdL5zR/vyklNg4FTn4hV7nJ5PaLM5uC0B1QSA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2805 Return-Path: guo.dong@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Guo Dong > -----Original Message----- > From: Liu, Zhiguang > Sent: Sunday, June 20, 2021 8:47 AM > To: devel@edk2.groups.io > Cc: Ma, Maurice ; Dong, Guo > ; You, Benjamin > Subject: [PATCH 08/12] UefiPayloadPkg: Include UniversalPayLoad modules > in UefiPayloadPkg.dsc >=20 > Add a new macro "UNIVERSAL_PAYLOAD" to build Universal Payload. >=20 > Cc: Maurice Ma > Cc: Guo Dong > Cc: Benjamin You >=20 > Signed-off-by: Zhiguang Liu > --- > UefiPayloadPkg/UefiPayloadPkg.dsc | 22 ++++++++++++++++++---- > UefiPayloadPkg/UefiPayloadPkg.fdf | 3 ++- > 2 files changed, 20 insertions(+), 5 deletions(-) >=20 > diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc > b/UefiPayloadPkg/UefiPayloadPkg.dsc > index e3d669a6d6..155aea4bc4 100644 > --- a/UefiPayloadPkg/UefiPayloadPkg.dsc > +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc > @@ -196,7 +196,11 @@ > TimerLib|UefiPayloadPkg/Library/AcpiTimerLib/AcpiTimerLib.inf >=20 >=20 > ResetSystemLib|UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.in > f >=20 >=20 > SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPort > Lib16550.inf >=20 > +!if $(UNIVERSAL_PAYLOAD) =3D=3D TRUE >=20 > + > PlatformHookLib|UefiPayloadPkg/Library/UniversalPayloadPlatformHookLib > /PlatformHookLib.inf >=20 > +!else >=20 >=20 > PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib > .inf >=20 > +!endif >=20 >=20 > PlatformBootManagerLib|UefiPayloadPkg/Library/PlatformBootManagerLib/ > PlatformBootManagerLib.inf >=20 > IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf >=20 >=20 >=20 > @@ -213,10 +217,12 @@ >=20 > DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLi > bNull.inf >=20 > !endif >=20 >=20 > PlatformSupportLib|UefiPayloadPkg/Library/PlatformSupportLibNull/Platfor > mSupportLibNull.inf >=20 > -!if $(BOOTLOADER) =3D=3D "COREBOOT" >=20 > - BlParseLib|UefiPayloadPkg/Library/CbParseLib/CbParseLib.inf >=20 > -!else >=20 > - BlParseLib|UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf >=20 > +!if $(UNIVERSAL_PAYLOAD) =3D=3D FALSE >=20 > + !if $(BOOTLOADER) =3D=3D "COREBOOT" >=20 > + BlParseLib|UefiPayloadPkg/Library/CbParseLib/CbParseLib.inf >=20 > + !else >=20 > + BlParseLib|UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf >=20 > + !endif >=20 > !endif >=20 >=20 >=20 >=20 > DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort. > inf >=20 > @@ -383,10 +389,18 @@ >=20 >=20 > !if "IA32" in $(ARCH) >=20 > [Components.IA32] >=20 > + !if $(UNIVERSAL_PAYLOAD) =3D=3D TRUE >=20 > + UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf >=20 > + !else >=20 > UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf >=20 > + !endif >=20 > !else >=20 > [Components.X64] >=20 > + !if $(UNIVERSAL_PAYLOAD) =3D=3D TRUE >=20 > + UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf >=20 > + !else >=20 > UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf >=20 > + !endif >=20 > !endif >=20 >=20 >=20 > [Components.X64] >=20 > diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf > b/UefiPayloadPkg/UefiPayloadPkg.fdf > index ed7fbcaddb..6073f9c1b4 100644 > --- a/UefiPayloadPkg/UefiPayloadPkg.fdf > +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf > @@ -52,8 +52,9 @@ READ_STATUS =3D TRUE > READ_LOCK_CAP =3D TRUE >=20 > READ_LOCK_STATUS =3D TRUE >=20 >=20 >=20 > +!if $(UNIVERSAL_PAYLOAD) =3D=3D FALSE >=20 > INF UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf >=20 > - >=20 > +!endif >=20 > FILE FV_IMAGE =3D 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 { >=20 > SECTION FV_IMAGE =3D DXEFV >=20 > } >=20 > -- > 2.16.2.windows.1