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.30939.1671657892201437941 for ; Wed, 21 Dec 2022 13:24:52 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=EFt3gejB; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: guo.dong@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671657892; x=1703193892; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=TSmQtnIeyjjFSVF0MJDFoL1IIIfj2jakOw1cuck3IyI=; b=EFt3gejB8l3wredZrEGISCyypzRCVSdTVAEXhEWAmCFAGEWYMv6jFobA 0j9aCfKwMMEgnA8weY+n5H7yCPXdaDkW9y8rQcvzWh3ZZSFBI2UoEThj2 0XEsvfy7zeezMX1XhBJb3A6HP7tSGIG+3dnxLlaEmbCWsFuHk+Ke3YRJb 1hAZUgbzuGCSAm2ruw4bgx8j6d1hqLaIbZ2cNc5M6sKAIBc9SM1X65XzX PYQ/VOCAmVHV+6tJehVxZ4LvMUnz4S5CfjFmg1WDrrKqHMdHBLpUevBwv 7oXI1W39X16iZ20UHojLijiihUVpfZ303ANf1Pl2yYMxFqvvDQecL+FVE w==; X-IronPort-AV: E=McAfee;i="6500,9779,10568"; a="406216714" X-IronPort-AV: E=Sophos;i="5.96,263,1665471600"; d="scan'208";a="406216714" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2022 13:24:51 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10568"; a="653631510" X-IronPort-AV: E=Sophos;i="5.96,263,1665471600"; d="scan'208";a="653631510" Received: from gdong1-mobl1.amr.corp.intel.com ([10.212.2.76]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2022 13:24:51 -0800 From: "Guo Dong" To: devel@edk2.groups.io Cc: Guo Dong , Ray Ni , Sean Rhodes , James Lu , Gua Guo Subject: [edk2-devel][PATCH] UefiPayloadPkg: Fix boot issue for non-universal payload Date: Wed, 21 Dec 2022 14:24:33 -0700 Message-Id: <20221221212433.1028-1-guo.dong@intel.com> X-Mailer: git-send-email 2.35.1.windows.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Guo Dong BDS module was moved from DXEFV to newly created BDSFV recently. Non-universal UEFI payload doesn't support multiple FV, so it failed to boot since BDS module could not be found. This patch add BDS back to DXEFV when UNIVERSAL_PAYLOAD is not set. Cc: Ray Ni Cc: Sean Rhodes Cc: James Lu Cc: Gua Guo Signed-off-by: Guo Dong --- UefiPayloadPkg/UefiPayloadPkg.fdf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayload= Pkg.fdf index 94ba922244..ee7d718b3f 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -59,9 +59,6 @@ INF UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf FILE FV_IMAGE =3D 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 {=0D SECTION FV_IMAGE =3D DXEFV=0D }=0D -FILE FV_IMAGE =3D FBE6C1E3-2F80-4770-88B0-494186E3346F {=0D - SECTION FV_IMAGE =3D BDSFV=0D -}=0D =0D ##########################################################################= ######=0D [FV.BDSFV]=0D @@ -277,6 +274,10 @@ INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiP= latformDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphics= ResourceTableDxe.inf=0D !endif=0D =0D +!if $(UNIVERSAL_PAYLOAD) =3D=3D FALSE=0D +INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf=0D +!endif=0D +=0D #=0D # UEFI network modules=0D #=0D --=20 2.35.1.windows.2