From nobody Thu Apr 25 23:41:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+46996+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+46996+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1567808415; cv=none; d=zoho.com; s=zohoarc; b=b1smgCkrM/jowIPs8hhz8H9oehJYddNJowOup2nOo+Hp0aD9Z9TRiJr/qYXdKfoBbQA8588QNXHaiel/S1hfNPVO36M5nPlCQXXTsrWxy92Pcbg0o46erLz+e4Zgt5j1RhWEA23Z4h7Z//21ohJy1oyWWTOZI1EALL9PZDI9DQ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567808415; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=Jr8YtUYNcekUDdIAfixfAbHDQclOnuLH4G0dpvdL2Y8=; b=VuQrjexpLrRVGhf2RICrM5wdLlG6o3v34HKKclNl6GsNvrTKc7wZZZ3dguTZAWFIfS6QuDI9pfST0jc/bLYUjejOwBGOajM/rRLTc1uGTHlW0+d64UnjhYwv8TUoLG+uLw1kByv2so2r3VxP+Ze5UTOlVFQ3kB4o732+ePTQ/SY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+46996+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 1567808415515483.53210521180586; Fri, 6 Sep 2019 15:20:15 -0700 (PDT) Return-Path: X-Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by groups.io with SMTP; Fri, 06 Sep 2019 15:20:14 -0700 X-Received: by mail-pf1-f170.google.com with SMTP id b13so5470476pfo.8 for ; Fri, 06 Sep 2019 15:20:14 -0700 (PDT) X-Gm-Message-State: APjAAAVuunuzusQq/wbrdKARE1juyqoV9xEYt5AuQcoNZloVoMxf3Syn uGQSaRxNfTgFBTUkNS27urrSTCMAJ1khpFCL X-Google-Smtp-Source: APXvYqxn3XNm2dyOHSLIxQ66hQUepCAsoIIjM4VwyWdo5dUEwIqIcqGpdxuTErFR4rT4CnVhTbIJuw== X-Received: by 2002:a63:5402:: with SMTP id i2mr9937963pgb.414.1567808413525; Fri, 06 Sep 2019 15:20:13 -0700 (PDT) X-Received: from e111045-lin.nice.arm.com ([8.25.222.2]) by smtp.gmail.com with ESMTPSA id n19sm7428351pfa.67.2019.09.06.15.20.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2019 15:20:12 -0700 (PDT) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, lersek@redhat.com, Ard Biesheuvel Subject: [edk2-devel] [PATCH] ArmVirtPkg: increase FD/FV size for NOOPT builds Date: Fri, 6 Sep 2019 15:20:04 -0700 Message-Id: <20190906222004.30161-1-ard.biesheuvel@linaro.org> 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,ard.biesheuvel@linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1567808415; bh=YBdLP+35Q8zg7dKk5HRVSyBnpquGbS+1vCMIYXIW0aw=; h=Cc:Date:From:Reply-To:Subject:To; b=DDObSmEmciD1kXp7ChW7Kjc8T/76J3M/DmZLgW27J7xNLiz7+MkvyDpSYfkmmWf3+gi o31SYxTBZeM8xgqK8mpWirnSgaZU6+VT0dvXSC5BFIEh9T0vjGslFNU0ByTH2iFh4g3fC +aKNV9IuGpcDtrFjDUY7fgvHAHycDE+UQWU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" After upgrading the CI system we use for building the ArmVirtPkg targets, we started seeing failures due to the NOOPT build running out of space when using the CLANG38 toolchain definition combined with clang 7. We really don't want to increase the FD/FV sizes in general to accommodate this, so parameterize the relevant quantities and increase them by 50% for NOOPT builds. Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirt.fdf.inc | 13 +++++++++++++ ArmVirtPkg/ArmVirtQemu.fdf | 14 +++++++++++--- ArmVirtPkg/ArmVirtQemuKernel.fdf | 14 +++++++++++--- ArmVirtPkg/ArmVirtXen.fdf | 14 +++++++++++--- 4 files changed, 46 insertions(+), 9 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.fdf.inc b/ArmVirtPkg/ArmVirt.fdf.inc new file mode 100644 index 000000000000..5fdebcf5dc93 --- /dev/null +++ b/ArmVirtPkg/ArmVirt.fdf.inc @@ -0,0 +1,13 @@ +# +# Copyright (c) 2019, Linaro Limited. All rights reserved. +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# + +!if $(TARGET) !=3D NOOPT +DEFINE FD_SIZE =3D 0x200000 +DEFINE FD_NUM_BLOCKS =3D 0x200 +!else +DEFINE FD_SIZE =3D 0x300000 +DEFINE FD_NUM_BLOCKS =3D 0x300 +!endif diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf index c2169cb7964b..27dd5bf09a91 100644 --- a/ArmVirtPkg/ArmVirtQemu.fdf +++ b/ArmVirtPkg/ArmVirtQemu.fdf @@ -20,14 +20,22 @@ # ##########################################################################= ###### =20 +[Defines] +!include ArmVirt.fdf.inc +!if $(TARGET) !=3D NOOPT +DEFINE FVMAIN_COMPACT_SIZE =3D 0x1ff000 +!else +DEFINE FVMAIN_COMPACT_SIZE =3D 0x2ff000 +!endif + [FD.QEMU_EFI] BaseAddress =3D 0x00000000|gArmTokenSpaceGuid.PcdFdBaseAddress # QEMU a= ssigns 0 - 0x8000000 for a BootROM -Size =3D 0x00200000|gArmTokenSpaceGuid.PcdFdSize # The si= ze in bytes of the FLASH Device +Size =3D $(FD_SIZE)|gArmTokenSpaceGuid.PcdFdSize # The si= ze in bytes of the FLASH Device ErasePolarity =3D 1 =20 # This one is tricky, it must be: BlockSize * NumBlocks =3D Size BlockSize =3D 0x00001000 -NumBlocks =3D 0x200 +NumBlocks =3D $(FD_NUM_BLOCKS) =20 ##########################################################################= ###### # @@ -59,7 +67,7 @@ DATA =3D { !endif } =20 -0x00001000|0x001ff000 +0x00001000|$(FVMAIN_COMPACT_SIZE) gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize FV =3D FVMAIN_COMPACT =20 diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKerne= l.fdf index f675b6d65ee1..1836697a0a90 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.fdf +++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf @@ -20,14 +20,22 @@ # ##########################################################################= ###### =20 +[Defines] +!include ArmVirt.fdf.inc +!if $(TARGET) !=3D NOOPT +DEFINE FVMAIN_COMPACT_SIZE =3D 0x1f8000 +!else +DEFINE FVMAIN_COMPACT_SIZE =3D 0x2f8000 +!endif + [FD.QEMU_EFI] BaseAddress =3D 0x00000000|gArmTokenSpaceGuid.PcdFdBaseAddress # QEMU a= ssigns 0 - 0x8000000 for a BootROM -Size =3D 0x00200000|gArmTokenSpaceGuid.PcdFdSize # The si= ze in bytes of the FLASH Device +Size =3D $(FD_SIZE)|gArmTokenSpaceGuid.PcdFdSize # The si= ze in bytes of the FLASH Device ErasePolarity =3D 1 =20 # This one is tricky, it must be: BlockSize * NumBlocks =3D Size BlockSize =3D 0x00001000 -NumBlocks =3D 0x200 +NumBlocks =3D $(FD_NUM_BLOCKS) =20 ##########################################################################= ###### # @@ -81,7 +89,7 @@ DATA =3D { !endif } =20 -0x00008000|0x001f8000 +0x00008000|$(FVMAIN_COMPACT_SIZE) gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize FV =3D FVMAIN_COMPACT =20 diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf index 79f681cde028..4007f49a08fb 100644 --- a/ArmVirtPkg/ArmVirtXen.fdf +++ b/ArmVirtPkg/ArmVirtXen.fdf @@ -20,14 +20,22 @@ # ##########################################################################= ###### =20 +[Defines] +!include ArmVirt.fdf.inc +!if $(TARGET) !=3D NOOPT +DEFINE FVMAIN_COMPACT_SIZE =3D 0x1fe000 +!else +DEFINE FVMAIN_COMPACT_SIZE =3D 0x2fe000 +!endif + [FD.XEN_EFI] BaseAddress =3D 0x00000000|gArmTokenSpaceGuid.PcdFdBaseAddress -Size =3D 0x00200000|gArmTokenSpaceGuid.PcdFdSize +Size =3D $(FD_SIZE)|gArmTokenSpaceGuid.PcdFdSize ErasePolarity =3D 1 =20 # This one is tricky, it must be: BlockSize * NumBlocks =3D Size BlockSize =3D 0x00001000 -NumBlocks =3D 0x200 +NumBlocks =3D $(FD_NUM_BLOCKS) =20 ##########################################################################= ###### # @@ -81,7 +89,7 @@ DATA =3D { !endif } =20 -0x00002000|0x001fe000 +0x00002000|$(FVMAIN_COMPACT_SIZE) gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize FV =3D FVMAIN_COMPACT =20 --=20 2.17.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 (#46996): https://edk2.groups.io/g/devel/message/46996 Mute This Topic: https://groups.io/mt/33207946/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-