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.web11.14808.1671428293736013958 for ; Sun, 18 Dec 2022 21:38:13 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=cYl4sNEO; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: james.lu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671428293; x=1702964293; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=CIZ9jn9Szho4y1XtEq9bux7zYwPWvW/+uHiAi16YJYs=; b=cYl4sNEO6sBRwuj24otfvsSlKak1Iry4cYCndpObTHYbMDJYPVQ7mlvL IDP6TFPlKpH3ZyauU2buuVafgyAURJcHjW1YyG5xrA5S4T7mZxj3o90PG 6GOKy8H4CkLJB9+OWhJzFbDPA8BKkh9HQ0y9XWgMyh7G9CW5Q6tf95lWb p6ltfWlIUcWzyYSfNlvDcca7V3mCzdCjtOBJieK+wtU5D0w3LtZiBpUxH RpcmboZeKGM9CJlzWPeWCE2gNb83bsNbjwNQqkFYs7LN8BTSk7B2iK1aM gYAfE4lTGEUlvNGczJEboagxwKOJYVuEUWVUkgdodcgAT2I/y+e83moIS w==; X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="302698681" X-IronPort-AV: E=Sophos;i="5.96,255,1665471600"; d="scan'208";a="302698681" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2022 21:38:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="682899514" X-IronPort-AV: E=Sophos;i="5.96,255,1665471600"; d="scan'208";a="682899514" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orsmga001.jf.intel.com with ESMTP; 18 Dec 2022 21:38:12 -0800 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX602.amr.corp.intel.com (10.22.229.15) 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:38:12 -0800 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX611.amr.corp.intel.com (10.22.229.24) 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:38:12 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx601.amr.corp.intel.com (10.22.229.14) 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:38:12 -0800 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.174) by edgegateway.intel.com (134.134.137.102) 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:38:12 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NpsmMxPu8IyBnDvDYneEPV1BjfkxFpnzwTl7JZpPOd+qJRqg2mp0fqT05zHc75grkFChqhCf0MTiw5NYZN+COfluMc9nONF9uxrb4yIcBZ8fEOF4/vBaOGcdcqopEw0Hxv9ZEIvfRWzYFCl3JGA93kDUfLCIOuG5EiPOm+biCgS6vB1fAynEjVKkMwDG7iuByBHTVch6zYPFjFMW+NiBELcPWfx39/aQIKR6fRY7I7DhsWiwbOgZ7dVI0hcXUJ9ppRfIlssCRr9kiK7a5E+QDyxdWQXmJehGLZfHlBt3FivAOKUx2nSORJVtydFatrm98TARNQve8ORcIxvDrwc0oQ== 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=lU3MSnKahwn6HjZUyjw/NM8T6ESOeiJtP8dNZxhM17o=; b=Imk0Ub1L5VW7963sg57EOV0CPr3PXO7+tK+W5G3DfezIG1ji8V3/exMjsVRuZeftV8C5EDHO+wnIhrLATMtSWjDGew8Bgp1el4OVeevouHit9aTKB9wjuf9pF1HJJ+41YD2Lw0zPdhOlWygN3kFB6+l26UPCVNHln5/YsXNFZyKNvCMziY+yte8amq5VinWLQjHPBOR9qTflo2ROaWU7E0Y7tm4CBa/GUJM+c0enS+TrMmdRe31MhHqKvXVm7wOaR4cwgMBtGQbHmem3shUEBFhAV8PQZ7Tj7/2h3DDyZxt/kGj9oVTDL+JnWtK9Sez6QlkMUy0tD3PgD5iOTrAVVA== 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 BN6PR11MB1908.namprd11.prod.outlook.com (2603:10b6:404:103::13) by PH8PR11MB7070.namprd11.prod.outlook.com (2603:10b6:510:216::10) 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:38:10 +0000 Received: from BN6PR11MB1908.namprd11.prod.outlook.com ([fe80::7f2f:e7db:3253:e5db]) by BN6PR11MB1908.namprd11.prod.outlook.com ([fe80::7f2f:e7db:3253:e5db%4]) with mapi id 15.20.5924.016; Mon, 19 Dec 2022 05:38:10 +0000 From: "Lu, James" To: "Lin, MarsX" , "devel@edk2.groups.io" CC: "Dong, Guo" , "Ni, Ray" , "Rhodes, Sean" , "Guo, Gua" Subject: Re: [PATCH] UefiPayloadPkg: Move bdsdxe.inf from DXEFV to BDSFV Thread-Topic: [PATCH] UefiPayloadPkg: Move bdsdxe.inf from DXEFV to BDSFV Thread-Index: AQHZE1b1ukJJT4uoFUCnxIoYciVawa50sVvg Date: Mon, 19 Dec 2022 05:38:10 +0000 Message-ID: References: <94caafaa6dc43b59fbc8080d548eccaef5e6d3fd.1671419016.git.marsx.lin@intel.com> In-Reply-To: <94caafaa6dc43b59fbc8080d548eccaef5e6d3fd.1671419016.git.marsx.lin@intel.com> Accept-Language: en-001, en-US, zh-TW 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: BN6PR11MB1908:EE_|PH8PR11MB7070:EE_ x-ms-office365-filtering-correlation-id: 082c1fa6-49f0-4a5b-3218-08dae18336b4 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: H1AF/ybJi95ygxuYH9jcBTbvcdYtItfijrFjl+aCeJCEbvQTT83Uy8Nm0C6d1Y4wf8OxA4u/XwEKCg5LMoyqa9Gija6kjcyAp8xbMVOlcfU8kUzWx5Kt/9SAUVHljA6bVyTcGx6b5EzvxwndRQ6ogQsBBgYUYi7dyjoytbhEdAdcVnqK0wKKmOsNQkcqYd+ed8p5K0exnpyjDSaMA+Onfl8dy5U9D5alIQ5Nowg4iRpPj7002End9DNxfagHvfGJRO4bm7wON0NgsK6bcdZpc0gdR2xJRayiYFgW57AOxJm12/g/w3GnW3Ct5YntAMTIZKSyYSTZSORA1T24c8WHpKWsMDEFBKYwpLK4Omsxl3s9IFJItFx+++opoR56lAfT0bqLUZO+jKZMPB1D8TXmUgmUZy1TMg2+m/nqqjasL2Sja+tiwjBfS6oeeXmC+k2eomrT03wbvrKJhLoR7qx8d53f/nLKME3d3n1SsYJoQaIBxgyEuh6b07vVtzLXpj1FHG5IXL9OAbqRJ5msIrel8YYzVcEf2Uh3be0EyphqthkcymSkIVu9+pCP9pvZFribsE4jm2S/jv9UX9H48n/1mfwaGkDFnQUy6hVVmFwzH9G4QR5Nh6zrdEUPpwjsavmjPzn8SsgJRWXcS2KAnDyvq3vxabbdOM+uqXFV4G4hIK3V/TRdHp+f1TYaC9NHXVeA/jL3KJII4C9lwRUIWMj4ZaBXfTXcnL35Cup9qphEZps= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN6PR11MB1908.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(376002)(366004)(346002)(396003)(39860400002)(136003)(451199015)(122000001)(4326008)(41300700001)(8676002)(38070700005)(38100700002)(82960400001)(5660300002)(52536014)(2906002)(83380400001)(53546011)(8936002)(33656002)(7696005)(6506007)(71200400001)(107886003)(478600001)(966005)(54906003)(86362001)(110136005)(316002)(66946007)(66476007)(66556008)(66446008)(64756008)(76116006)(9686003)(186003)(55016003)(26005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?euhmPMfleUEWx7OjttdgPmGcu9gxqWt88fL+0PUU+eIT7P/U51+BrxMHG6Fb?= =?us-ascii?Q?LRxEmfqV3eAMa8kRsqZf75R3qki65gX7LJbPHrv0piLUwe3y3CzctSyaWpLl?= =?us-ascii?Q?AHs1O29ronHfFOumlTL8AZxFRD3c2slJyZE3i4Do+rtG4bljIU0Wrh1hkc+d?= =?us-ascii?Q?hzOGgGcfri8h3vnJSqIZgsGRg14FGKuT4HZdTjGwp97S39k7nUJ5aYEY6NxC?= =?us-ascii?Q?5GNE/3M6gQp6zxEvv+OYbAmE1C8Ab0SVezzIJWUAhkA/TKmeTr8F4blSEE9H?= =?us-ascii?Q?U1DbIbVYBuQ18qODuPF1sttXf43ztXJIdWaTkUd090o6cjUAVYTAl7g5OH9X?= =?us-ascii?Q?J1fjJxjODOfIqMoystZ2MBhAPr2VuO/Sjjd4HoPk7ZLmVxULzGC+HrWK1W2z?= =?us-ascii?Q?LP8zzgjPndBObt1o7wq6CS7uZZIZGccO8ErV/08C5AvDpMuJoiyOaq34bEE/?= =?us-ascii?Q?kERb096tSDKDFBTnxwm8vGojm7sH3XA0tzb/7gceDZgsrIDAYXIhX90/NtiI?= =?us-ascii?Q?W664v9pdL9lIUmtXb5+WizskwQT2v6Vb6wuQZviCsGN7Wpj94mBCcewFmqKX?= =?us-ascii?Q?n3zzL5Heh/k4uo5+5l1WBJQidO585Y0o8pNnpeVm6DGAvLHSG9u/F1oZ+wH4?= =?us-ascii?Q?bFcrDIloWTzj3olD3qbjFKqOKh1xBnaztx2PzS6d4cRycQL+j1anFlvdlR36?= =?us-ascii?Q?MH4Mwvfp+k/auflEs5lcax2mDhGOeVbzLD7m10D1dCRCY3pMumcawolCF9Co?= =?us-ascii?Q?/dSvM0R0xxNNakWJbbefZSwUi1/YcSDgfLBs1drT9rF/lSvsFbBOdljVbK86?= =?us-ascii?Q?MN6WFFzagQgUhr+BQ4+1THHRxt43ntyN4eSMFb21HqJOLeZ3GejTdH+z8BUu?= =?us-ascii?Q?ytZLYviNK8jp8sLj07vVL4b3yNwC7FY9dfconfk9CZOyLer4wHQOjbUNtcgz?= =?us-ascii?Q?J5LxjokfNEhfguuwtsrJc73YS/pNMLl7xNr0MEtNMYQO7vVMjzLN+khXab7z?= =?us-ascii?Q?TXpQZ4ZVbvM1EPXSAV505Fv8OdfyHZ8RaF5sJbOL1swAhVnrvghpUuYZuowu?= =?us-ascii?Q?lP9pL7GOiDo0UBjjrEFmaERJ2KKg5j8ijZfY48CxE+3mrJF5kaJ5wpypTaLh?= =?us-ascii?Q?MAZW0C2Vm86PaHSNrRfUMMlX0mK4eRp5hlPRLeZq8lhxqvM5M1shXaEsyDw9?= =?us-ascii?Q?OM2TP6aoa07QWxYevqVbjYvh9KXqDMyoCjxjBFfwpoXJ4PYuOjCiYduUf7uf?= =?us-ascii?Q?3rocycD7WvWyNM45zlFeofa6rZFRGNC3deY//mt4BBAc1U/ZQ45gr4a+gitL?= =?us-ascii?Q?AsClK07EWeKTXVWhngXr03PqnFQILe7ngO26+rWt2wQMYsxp1S2/r8FSG482?= =?us-ascii?Q?Uo+EvYi7oPCw1u6E7lWUuR0ui4uL3/yCEYyh7g/ck5XxsR4wAUUlmuEJ9uG8?= =?us-ascii?Q?9SfR1yHvOxjrebJ4f3A/XfFD4HRoExTVLo/nT5VZY+3whUfvlvDwiqTBVbwR?= =?us-ascii?Q?EP9g916wzcFRlphjE8122XFhV2de/SmtBu6GDxBk8HX5dSJim8vO5D+cOkbu?= =?us-ascii?Q?sELtsBpF2s+LLAKg0C+yZSav166mHULSu6+TvgA1?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN6PR11MB1908.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 082c1fa6-49f0-4a5b-3218-08dae18336b4 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Dec 2022 05:38:10.0934 (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: 1apqqwl6HfSvEwjG8BKEksGF4ln2qXhGkPuJIWUdH9aoSQgqgfHYHdwpzVGQK2nBqFK178e203W7ABKcrsqTPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB7070 Return-Path: james.lu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: James Lu -----Original Message----- From: Lin, MarsX =20 Sent: Monday, December 19, 2022 11:07 AM To: devel@edk2.groups.io Cc: Lin, MarsX ; Dong, Guo ; Ni, R= ay ; Rhodes, Sean ; Lu, James ; Guo, Gua Subject: [PATCH] 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..f242b039b4 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.upld_info=3D4 --set-section-alignm= ent .upld.uefi_fv=3D16 --set-section-alignment .upld.bds_fv=3D16 {}'.format= ( LlvmObjcopyPath, ObjCopyFl= ag, ObjCopyFlag,--=20 2.33.0.windows.2