From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web11.14703.1671427732411490031 for ; Sun, 18 Dec 2022 21:28:52 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=Xjo1Us9J; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: gua.guo@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671427732; x=1702963732; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=E1Gd0uEgrOcIuCPYPmNoneew6JDE46GZXvmzf8MHj5s=; b=Xjo1Us9JgyvvyIr5+jd0GZYSAG0oWThjnQ4dZNXNoHCQWVg6DkeqrBTi 30m4FWnsIkCy2qXbfVtQJjnDfruP7BJaeiGcnsX4GgeTKSSZOaF5aLTyX e5rnm0piUDWCNwwpNcaUfPAf976eRtyQA8pLBnor9UfGXygNTv/cucS6A glwGMDOvyPXQ1+zYR3oUQkiZ7m2pPLzMHgnpL8BYMKHKjQUrqHmm4tMqb I0IcW8SR4RwR3lLEiQLmij5WEKg9y4n+JXshZEpWJm7kBTs9aaDhaUuJk pA1vSqXSw82vjgsR+GoALRVMqz2Y9MqD5culfeqNmR3SYXiqILsHa9inC A==; X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="317962673" X-IronPort-AV: E=Sophos;i="5.96,254,1665471600"; d="scan'208";a="317962673" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2022 21:28:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="713889905" X-IronPort-AV: E=Sophos;i="5.96,254,1665471600"; d="scan'208";a="713889905" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga008.fm.intel.com with ESMTP; 18 Dec 2022 21:28:51 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) 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.2507.16; Sun, 18 Dec 2022 21:28:51 -0800 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) 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.2507.16; Sun, 18 Dec 2022 21:28:51 -0800 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16 via Frontend Transport; Sun, 18 Dec 2022 21:28:51 -0800 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.169) 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.2507.16; Sun, 18 Dec 2022 21:28:50 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BWRDr+xrsHrbOoNDnC7goEjJ051/lZqadirGrQv06n6LIGh7YggAueMvt1B6jxHPDlWyMLiaOTownGNjQAlpdCcRQ21AmIZbU5gvJGJlbIq0hwMG3qKKkXbKeLAzPepUwJUiZtBoIxUJdVRdmWGEoiWba/zqVob7Kn9nH1gaz9Mnml2L2vuIp7ahNcG6Otc3aMlzcciXxmQnOJJS+xjNJGbIojkayAv0kJAeurGFAgqRW9fd5BFm3pL6cugGcoyS7puch6BaJl3VuF38sxUOmyxgcGub0FFVRjqTOesVJLHRi0+/twG1JqpXgsMh08b4SnxcTUJbhZgYDMV5af4ByQ== 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=IIXtqn7tTRRqNlGrT4vKA7VwvA3+iKW89gNGZZkWnds=; b=a8RXpNSLxfKLcGXfWHnyp+QLx4ydG+rnQ4bGJUcYu5weCKHsgMtkDunWRbYFa9sBQYyURkByhQt4TakoF0jsIUtXMWxRjTxQsd4a6yejorB5TNB1WTRFJWjVbfOihoakzVgRDG8Z1l8FI0gouX3y2gjwzEn5P4ixCA9zAJFZkqY/JkHdJnY+PC0XB0x86lHSISL31ZhvouOxaYkQzYB1benipHogjevLV9jAIgof+EyUcdRwTwcjxtFrFkecmpQINlk60SJB+RU5qZGu37seHpk4KOZGlt77iOYxzfxlyT9YyhzzCP+DxyvZneBURijYr2WCWs3Z35OK5zU0Z81/Qg== 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 Received: from BL1PR11MB5478.namprd11.prod.outlook.com (2603:10b6:208:31d::12) by BL3PR11MB6506.namprd11.prod.outlook.com (2603:10b6:208:38d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Mon, 19 Dec 2022 05:28:43 +0000 Received: from BL1PR11MB5478.namprd11.prod.outlook.com ([fe80::eb2d:a316:8bcd:3fb6]) by BL1PR11MB5478.namprd11.prod.outlook.com ([fe80::eb2d:a316:8bcd:3fb6%8]) with mapi id 15.20.5924.016; Mon, 19 Dec 2022 05:28:43 +0000 From: "Guo, Gua" To: "Lin, MarsX" , "devel@edk2.groups.io" CC: "Dong, Guo" , "Ni, Ray" , "Rhodes, Sean" , "Lu, James" Subject: Re: [PATCH v2] UefiPayloadPkg: Move bdsdxe.inf from DXEFV to BDSFV Thread-Topic: [PATCH v2] UefiPayloadPkg: Move bdsdxe.inf from DXEFV to BDSFV Thread-Index: AQHZE1jlu77MZvIPBECuk6koxk6Dd650rrIg Date: Mon, 19 Dec 2022 05:28:43 +0000 Message-ID: References: <20221219032033.532-1-marsx.lin@intel.com> In-Reply-To: <20221219032033.532-1-marsx.lin@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BL1PR11MB5478:EE_|BL3PR11MB6506:EE_ x-ms-office365-filtering-correlation-id: 0505c42e-89d2-4752-69f3-08dae181e510 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: q9NgBYaVriiutspjU+KvYQqFL4bAFf8tfApms0pK8XPXDv0Lni96+wM/OI5sIwnKnIWBltJZ4q1hpU2Nps478Uh2PBpvIuzsZKMvW99ZYDAap5VEcVx992e0nYiroNw2+uho5ietTgQmICrso9UCFyE93PIG/OkLP3iP5U2QGIe0ed0A4YVxLPo+Zqm03QUNM+afuimBJzFnRHFhrdZsURZKPhvS77psfvXED8yoHouDDR3YnjQtGDKof2eiBXz1tSK0uYvzyTjgN7BkzgrEOWhMjfcn927vjGcqSzlScTuDRpLPOZTiPfRcO8+umeNbS7PRn021rZTj4xOcRg+waZMKsPyBYTIgAe6wjow5l+BQhX32Hov80cM+tHT10+GyJ1WdkgWDyp3UBW6E7BgNlOiCrn2FVEe63Vm7TqpDUdZ/mFLBlaiHeNU2jTSlExCtTSRD2cyAKXsBpeW68f931F1w8+hyIihk3TrTdvD8vJxOHoae5TGJrKpnbnR9ZwbLmBbEfhLJRjt0r+j5J7RIh2AyKQ5Z/kvLQlcwt3Pz2AZwvLDUYD90r7qXAGVyf1wQ6uEvj/Lwk8w1QvMMvhIB/y4psSZ6KEgfxxLFYekeqYoFHWF+lSAFoYLsfnUGbB+gjU9cguVLoQzYjwJy96yg5x6hdFX9N1rWT4iDhwlrCYHIknrDcTBYVcDT+YqB3fotYxCErp5dzSpWzNf1pirUaK80hWcfG5Rwl9+ZHI6PT4E= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL1PR11MB5478.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(376002)(136003)(346002)(396003)(366004)(451199015)(107886003)(478600001)(966005)(71200400001)(6506007)(7696005)(66946007)(66556008)(66476007)(66446008)(64756008)(76116006)(186003)(26005)(9686003)(86362001)(316002)(54906003)(110136005)(55016003)(38070700005)(82960400001)(38100700002)(122000001)(8676002)(4326008)(41300700001)(83380400001)(8936002)(52536014)(33656002)(2906002)(53546011)(5660300002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?EJOK+ZtkQcXsjCaRC2sWSaXGpHNZIO2BnUSYnpCn90hEDBozZSspCPOaKxfi?= =?us-ascii?Q?AA/FzdMDaPhD0tSNWB+wDmX1O2IWyKRiWd0xXX8ppaspR0xIyAW8gB+QPjga?= =?us-ascii?Q?L8APzLbK8TyiyWrs1LE57xbjLw6w1S9WdL1vyZ6zYDSgY1fFot2NcHUAuNbo?= =?us-ascii?Q?j9djy70RPZDwjI6d6hEvuB19Mi5FxZCckl5fk60P6vOlU5O2QWAa8UKc/crY?= =?us-ascii?Q?U60XKo5qsuyZaxNRPrceSrlQRvK2yydlyN6NjFVJKJ3jmZ07M0Ea92qufSfq?= =?us-ascii?Q?+y5k1e1uhr9/cBJaV0Lw+NfPQkrMTc4jB9PDc7d93pvI7vV/SteWW491qKW0?= =?us-ascii?Q?imYzS9xeFH3owXCWkOH+qXSDO6jT1eZbcrCL+fReENx6YIAbxPgLtG3LXtCr?= =?us-ascii?Q?2/P6yUq5NTbEw0eay1N1M6tOODSrs5Xfq9atX/ET3WODicoL8MVRmIMZNR61?= =?us-ascii?Q?nKm+wz3pWaVQXdh103p1JMDtQah8RqXS8RY59SnH7Ot0ZQ8nmx785oZbca//?= =?us-ascii?Q?YQJ9n5FkhySmt6fX8yqkQMzS42qcUtN5DtkOJGWOOgIgBz34kM5fSHDY4tR4?= =?us-ascii?Q?DLrfdovSOKdg8xdwIdGi0EXn0bKEEOVsYvhK6P6R7NV5kCBcyIcHzkl4TZvM?= =?us-ascii?Q?ksmIB4H2Up5mymEXH5NOuRxdHIY1N1LQEGWx6Hb6diWrMSW0CHETptohL0fi?= =?us-ascii?Q?qt5ldQqN8H8xISVCDwzfB6wBqadJfQpYxBQecRp6FEp8iTsdbmv83fyjTYbn?= =?us-ascii?Q?39RTJAGwaJucxmDYpEJq+NLvuPdLzBjYjel2uzOwUQ0XD6gD2/zrLxam5URY?= =?us-ascii?Q?zs0u/bAvQnXbnsLwSlNDQ87u5gKMOf8zQtGNpfFYrWnogfiiJkqRtwPWXna5?= =?us-ascii?Q?Sq6IimSrW9KgITVvty5grgXtpPv8PF/gHH7Q1Aqo6zGvSgoY3uoz3g1Rwk8h?= =?us-ascii?Q?po7H2sF30IxiputUiH4B4uZ8JmKzUDoKxrQzxXkqXFqz64xZ5h3vAXwxs1kT?= =?us-ascii?Q?eaoWRBQyafpmck2sjTm/C98zN9YHmqtVs9RlSJkdb5Smz0AjpRcK8fb0hhUw?= =?us-ascii?Q?QteTVN+5yMQwH+lN4dkTmrKGKP/WjmnbPV1zyj0YUZUPqmeS9vmRNxN1nphC?= =?us-ascii?Q?Ftok7nPunerbG/cq3glZQrLFRVwaDGZTYBFoyq7IFBXxdoecyeV8mE3asdSl?= =?us-ascii?Q?IgqzzgjUOdDnxFW2Iv0+ZWC/URZfduxYe78iUbefUQ8Jc8o5DU07CyrmibIc?= =?us-ascii?Q?DtyKjbHf0PlOYGUo0A0K2/367Pr2o/u0VlLcjsd3gCeRPHYMCHVXmoJtQc1Y?= =?us-ascii?Q?ccw8DbbeNh26Mmcpp7YpGzcaCY3ReWa0ud50+Q3mj17+oLMSp2XGja7Jk4+b?= =?us-ascii?Q?1a2zejJGxLQZiUhj4CQQCfg3LHGxqNCssz22CU5huxXTriky//tPq/teWOYG?= =?us-ascii?Q?leh7XcXBza0vRH2rBVhfP/gkEHVxbNedvhJqQjENMwHI9h/giW/ulj2a7XBt?= =?us-ascii?Q?AxOgw3GQKj4AbKWWY+gcnuCDfo11HcuhQ1T+3TVVT2FX/PjOWX2zpHRSHbQf?= =?us-ascii?Q?i4lao3RRsinilvnmCW0=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL1PR11MB5478.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0505c42e-89d2-4752-69f3-08dae181e510 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Dec 2022 05:28:43.5966 (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: agLLeLsuYI7CTd0iJdXdyfB434dEzID3mhCuo2zsxVTccRgwBA1nuw/Y9b0amVEpdop+0GRgnc7Dh5mfE9Lweg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR11MB6506 Return-Path: gua.guo@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Gua Guo =20 -----Original Message----- From: Lin, MarsX =20 Sent: Monday, December 19, 2022 11:21 AM To: devel@edk2.groups.io Cc: Lin, MarsX ; Dong, Guo ; Ni, R= ay ; Rhodes, Sean ; Lu, James ; Guo, Gua Subject: [PATCH v2] UefiPayloadPkg: Move bdsdxe.inf from DXEFV to BDSFV From: MarsX Lin REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4196 Since UefiPayload had supported multiple fv, move bdsdxe.inf to new firmwar= e volume and modify the script of UniversalPayloadPkgBuild.py to support bd= sdxe fv in elf file Cc: Guo Dong Cc: Ray Ni Cc: Sean Rhodes Cc: James Lu Cc: Gua Guo Signed-off-by: MarsX Lin --- UefiPayloadPkg/UefiPayloadPkg.fdf | 27 +++++++++++++++++++- UefiPayloadPkg/UniversalPayloadBuild.py | 12 +++++---- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayload= Pkg.fdf index 9c9e2f2741..94ba922244 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -59,8 +59,33 @@ INF UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf FILE FV_IMAGE =3D 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 { SECTION FV_IM= AGE =3D DXEFV }+FILE FV_IMAGE =3D FBE6C1E3-2F80-4770-88B0-494186E3346F {+ = SECTION FV_IMAGE =3D BDSFV+} ###########################################= #####################################+[FV.BDSFV]+FvNameGuid =3D CA5= 590AF-9558-4822-B5EA-BE2E876CD3EC+BlockSize =3D $(FD_BLOCK_SIZE)+F= vForceRebase =3D FALSE+FvAlignment =3D 16+ERASE_POLARITY = =3D 1+MEMORY_MAPPED =3D TRUE+STICKY_WRITE =3D TRUE+LOCK_CAP = =3D TRUE+LOCK_STATUS =3D TRUE+WRITE_DISABLED_CAP =3D TRUE+WRIT= E_ENABLED_CAP =3D TRUE+WRITE_STATUS =3D TRUE+WRITE_LOCK_CAP =3D = TRUE+WRITE_LOCK_STATUS =3D TRUE+READ_DISABLED_CAP =3D TRUE+READ_ENABLED_C= AP =3D TRUE+READ_STATUS =3D TRUE+READ_LOCK_CAP =3D TRUE+READ_= LOCK_STATUS =3D TRUE++INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf [FV.D= XEFV] FvNameGuid =3D 8063C21A-8E58-4576-95CE-089E87975D23@@ -106,7 = +131,7 @@ INF CryptoPkg/Driver/CryptoDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf !endif INF = UefiCpuPkg/CpuDxe/CpuDxe.inf-INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf+ = INF RuleOverride =3D UI MdeModulePkg/Application/UiApp/UiApp.inf INF MdeMod= ulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf INF PcAtChipse= tPkg/HpetTimerDxe/HpetTimerDxe.infdiff --git a/UefiPayloadPkg/UniversalPayl= oadBuild.py b/UefiPayloadPkg/UniversalPayloadBuild.py index 50a5950e7c..6d62b8b20f 100644 --- a/UefiPayloadPkg/UniversalPayloadBuild.py +++ b/UefiPayloadPkg/UniversalPayloadBuild.py @@ -67,7 +67,8 @@ def BuildUniversalPayload(Args, MacroList): EntryModuleInf =3D os.path.normpath("UefiPayloadPkg/UefiPayloadEntry/= UniversalPayloadEntry.inf") DscPath =3D os.path.normpath("UefiPayloadPk= g/UefiPayloadPkg.dsc")- FvOutputDir =3D os.path.join(BuildDir, "{}_{}".f= ormat (BuildTarget, ToolChain), os.path.normpath("FV/DXEFV.Fv"))+ DxeFvO= utputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTarget, ToolChain)= , os.path.normpath("FV/DXEFV.Fv"))+ BdsFvOutputDir =3D os.path.join(Buil= dDir, "{}_{}".format (BuildTarget, ToolChain), os.path.normpath("FV/BDSFV.F= v")) PayloadReportPath =3D os.path.join(BuildDir, "UefiUniversalPayload= .txt") ModuleReportPath =3D os.path.join(BuildDir, "UefiUniversalPayloa= dEntry.txt") UpldInfoFile =3D os.path.join(BuildDir, "UniversalPayloadI= nfo.bin")@@ -119,21 +120,22 @@ def BuildUniversalPayload(Args, MacroList): # # Copy the DXEFV as a section in elf format Universal Payload en= try. #- remove_section =3D '"{}" -I {} -O {} --remove-section .upld_= info --remove-section .upld.uefi_fv {}'.format (+ remove_section =3D '"{= }" -I {} -O {} --remove-section .upld_info --remove-section .upld.uefi_fv -= -remove-section .upld.bds_fv {}'.format ( LlvmObjcop= yPath, ObjCopyFlag, ObjCopyFl= ag, EntryOutputDir )- add_= section =3D '"{}" -I {} -O {} --add-section .upld_info=3D{} --add-sectio= n .upld.uefi_fv=3D{} {}'.format (+ add_section =3D '"{}" -I {} -O {} = --add-section .upld_info=3D{} --add-section .upld.uefi_fv=3D{} --add-sectio= n .upld.bds_fv=3D{} {}'.format ( LlvmObjcopyPath, = ObjCopyFlag, ObjCopyFlag, = UpldInfoFile,- FvOutputDir,+ = DxeFvOutputDir,+ BdsFvOutputDir, = EntryOutputDir )- set_section = =3D '"{}" -I {} -O {} --set-section-alignment .upld_info=3D4 --set-secti= on-alignment .upld.uefi_fv=3D16 {}'.format (+ set_section =3D '"{}" -= I {} -O {} --set-section-alignment .upld_info=3D16 --set-section-alignment = .upld.uefi_fv=3D16 --set-section-alignment .upld.bds_fv=3D16 {}'.format ( = LlvmObjcopyPath, ObjCopyFlag, = ObjCopyFlag,--=20 2.33.0.windows.2