From nobody Fri Mar 29 09:42:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+61547+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+61547+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1592705690; cv=none; d=zohomail.com; s=zohoarc; b=hXSRuDd/kOKc4I6bg7jqzMYFy+RdS0+RVVzsvG6MO4CdV0/VPqdpOP4Kf3aSFcdfjLrIjNv0HLfX1qZHXtVRecsCfP9TdUJBCTvoHfyblRu6CdSbwe0g5K7LxOg517gY+yTPDig4XxxYO12Ryzafyv87bSdPNvyeJlFKhCVJCsQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592705690; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=HBzns+FuKrpSlmpVGYPJ1rUkOMkU+ht+3a8rRf7/8fc=; b=nWMxyYezMMFh7UpR31o3aJQmd2sjewznJ8uUg9KWJiKWdqYnsvbbT/I8WTtAxLQNwpsOj3Q/tT9NxttBBtNFYxhLc9NuC2kZtiZ2QdGEaa9z33+aaYsteuvm3DU/2ZQ8zHNXDYGepLDhUkkl26LxYZsox7KCeLaBKElwGv31fwo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+61547+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1592705690063846.5465059232607; Sat, 20 Jun 2020 19:14:50 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id etNYYY1788612xQADDufsjt2; Sat, 20 Jun 2020 19:14:49 -0700 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.8827.1592705689033875842 for ; Sat, 20 Jun 2020 19:14:49 -0700 IronPort-SDR: ye+ewOQew2hhCDvN8Nyn/cI/y49+912sMPzx8jYjw5LMfV7egdQnCChT+uAkJ5zS78CJQeZz4n zA516ls3G+EQ== X-IronPort-AV: E=McAfee;i="6000,8403,9658"; a="130838132" X-IronPort-AV: E=Sophos;i="5.75,261,1589266800"; d="scan'208";a="130838132" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jun 2020 19:14:47 -0700 IronPort-SDR: gk9zYFFYwSVAqSJrgVb7eLgdZtsrRgLVK2vKlspeerS8u+at6KrOo6N7dMX4eVt7PGRPdhOxhC 3AkBDdEFcFnA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,261,1589266800"; d="scan'208";a="478057608" X-Received: from gdong1-mobl.amr.corp.intel.com ([10.209.22.173]) by fmsmga005.fm.intel.com with ESMTP; 20 Jun 2020 19:14:47 -0700 From: "Guo Dong" To: devel@edk2.groups.io Cc: maurice.ma@intel.com, benjamin.you@intel.com, guo.dong@intel.com Subject: [edk2-devel] [PATCH V1] UefiPayloadPkg:Fix NOOPT build failure Date: Sat, 20 Jun 2020 19:14:41 -0700 Message-Id: <20200621021441.32356-1-guo.dong@intel.com> Precedence: Bulk List-Unsubscribe: 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: aloXPUVzvBbwJaHXmB2WTZz3x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1592705689; bh=IH9ktHfA61hn0u28jvehrZgx+yGMyV2rAAQ7en518h4=; h=Cc:Date:From:Reply-To:Subject:To; b=fCnuOYdCFKEkO9uTTLOqbRuf0A78TMT6HaKiVMgvgTtYgxxGSqLE4+lgPbF+2/3ox7a wx2UlINTcTfV8UCHquPP6n7Cj7x1BEnvZ+tnSsNTzvdkohfQuhWv4qR3UHKcWP+g3dswZ +aJxMYO92XXGEaR/w8ZzR8a+nrWdQBAO8Wc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When build UEFI payload using NOOPT, it would build failure since the FV size. So this patch increases FV size to support NOOPT. If not NOOPT build, there is no change to FV size. Signed-off-by: Guo Dong Reviewed-by: Maurice Ma --- UefiPayloadPkg/UefiPayloadPkg.fdf | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayload= Pkg.fdf index dfbcde5668..a04fcd2ec2 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -8,23 +8,39 @@ # ## =20 +[Defines] +DEFINE FD_BASE =3D 0x00800000 +DEFINE FD_BLOCK_SIZE =3D 0x00001000 + +!if $(TARGET) =3D=3D "NOOPT" +DEFINE PEI_FV_SIZE =3D 0x00050000 +DEFINE DXE_FV_SIZE =3D 0x00800000 +DEFINE FD_SIZE =3D 0x00850000 +DEFINE NUM_BLOCKS =3D 0x850 +!else +DEFINE PEI_FV_SIZE =3D 0x30000 +DEFINE DXE_FV_SIZE =3D 0x3E0000 +DEFINE FD_SIZE =3D 0x00410000 +DEFINE NUM_BLOCKS =3D 0x410 +!endif + ##########################################################################= ###### [FD.UefiPayload] -BaseAddress =3D 0x800000|gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemBa= se -Size =3D 0x410000|gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemSi= ze +BaseAddress =3D $(FD_BASE) | gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdM= emBase +Size =3D $(FD_SIZE) | gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdM= emSize ErasePolarity =3D 1 -BlockSize =3D 0x1000 -NumBlocks =3D 0x410 +BlockSize =3D $(FD_BLOCK_SIZE) +NumBlocks =3D $(NUM_BLOCKS) =20 -0x00000000|0x030000 +0x00000000|$(PEI_FV_SIZE) FV =3D PEIFV =20 -0x00030000|0x3E0000 +$(PEI_FV_SIZE)|$(DXE_FV_SIZE) FV =3D DXEFV =20 ##########################################################################= ###### [FV.PEIFV] -BlockSize =3D 0x1000 +BlockSize =3D $(FD_BLOCK_SIZE) FvAlignment =3D 16 ERASE_POLARITY =3D 1 MEMORY_MAPPED =3D TRUE @@ -54,7 +70,7 @@ INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf ##########################################################################= ###### =20 [FV.DXEFV] -BlockSize =3D 0x1000 +BlockSize =3D $(FD_BLOCK_SIZE) FvForceRebase =3D FALSE FvAlignment =3D 16 ERASE_POLARITY =3D 1 --=20 2.16.2.windows.1 -=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 (#61547): https://edk2.groups.io/g/devel/message/61547 Mute This Topic: https://groups.io/mt/75013473/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-