From nobody Tue May 14 06:50:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+97710+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97710+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1671657893; cv=none; d=zohomail.com; s=zohoarc; b=iigWuE4EaaxIZbip0/kaksVk5deGbk/fuVDBfqQCXgvb0S5rEz9ZdlaMdXL6emdOyhvl/TNCCl6PmrxlOnFcxsZes2BzZsKXxIFzIl+88Pgfq4EgojGflAEAMnAobyOjmYJhdSF1Luf9Ajr3gcZ9WMeavxTzHNKuNcyDTBWvvrM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671657893; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=uFLuup15Hl5AQXUgH8yClTrDWt1qOoRoxC76jkloqKw=; b=NcUmIe8Ru9pp6VOtHLCHjusO2BL2MPE7FnKixnP2KZtkG1MTc5Om0KUdbNnhDOZOjpy8kQZvYUaEWNTfsBLv2NtZjgjlBWOhmonr/FbazTKFFpIORqM7RtfAcC9k/NgF4J6LYQu6haP+hkl82XVPmwxWJwrjuhzwgiiYIRTvBPI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97710+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1671657893450707.5936283878906; Wed, 21 Dec 2022 13:24:53 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id UND7YY1788612xESnXR91Hkf; Wed, 21 Dec 2022 13:24:53 -0800 X-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 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" X-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" X-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> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,guo.dong@intel.com X-Gm-Message-State: a68yBe9JYauZhjDsZIehAqlpx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1671657893; bh=013yxZ0csMZdEGp4rF48gyUEwncn9uNA2dhlcJcvsCI=; h=Cc:Date:From:Reply-To:Subject:To; b=cBG6QFNaJTiR8kP8xpgg63k89KTweQhrRT4Llq6sZoPTOj4pa8zJliOf2i6SrzmQ4nv vymsafBfRIt6CaLuMA9KqNnTyjiFkFTiRJhC2vyHPtkddTKWNnKnXpFFvWXvPn6s68b2M 0m2zxJUhgPIzKqleY0Ai1ERj3TmPbdQ/h/8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1671657894197100001 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: =20 Reviewed-by: James Lu --- 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 { SECTION FV_IMAGE =3D DXEFV } -FILE FV_IMAGE =3D FBE6C1E3-2F80-4770-88B0-494186E3346F { - SECTION FV_IMAGE =3D BDSFV -} =20 ##########################################################################= ###### [FV.BDSFV] @@ -277,6 +274,10 @@ INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiP= latformDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphics= ResourceTableDxe.inf !endif =20 +!if $(UNIVERSAL_PAYLOAD) =3D=3D FALSE +INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf +!endif + # # UEFI network modules # --=20 2.35.1.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#97710): https://edk2.groups.io/g/devel/message/97710 Mute This Topic: https://groups.io/mt/95815569/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-