From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::144; helo=mail-it1-x144.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-it1-x144.google.com (mail-it1-x144.google.com [IPv6:2607:f8b0:4864:20::144]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D21152119C88B for ; Wed, 19 Dec 2018 09:32:33 -0800 (PST) Received: by mail-it1-x144.google.com with SMTP id p197so10486679itp.0 for ; Wed, 19 Dec 2018 09:32:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=JXIDAxblpzYCO8TNiPqgF0t4E3Qvg5t/V0Gl4HBpn44=; b=QwmhbcXF11S8EidvYIg6jFRyadIW2NCJdEQoBt1r7VIPtPJLRhPOcf0tlVUtzyRv8h OY+1QVUKZ/weG7up2+/G+U5bZziXXcrRwyagPmSMD4qTTjwbVTpWCUbfvgtZnkJuwpHn 100HMfQAORJRNzp5LEJVJDfvjdX3hlMk1bOCw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=JXIDAxblpzYCO8TNiPqgF0t4E3Qvg5t/V0Gl4HBpn44=; b=QcuebLfsjRHNm9U6ddro/VmGFUng1EIX1yhZUvkn5zwz/2/y6t6Yz6EMfKxs/j9/iy FHt5RsCk7eU8TtqMXcd3uQ0fFPJLqHe5TXpixSiiVPb2MXfG6/sDqImHgLFsepnj+bwL 1ps9oVBzeLrnJ1QxDSrkqlwIFi/6mqV/ir16k+fQpkUdqdOyDaWJEEgTFLAWu+mPevXw B1jiFyNUW9JqipMfrXml9Bj9xzr5dMVCA1yJAoivly3IFIZFSdY4YNTACtqCfEWJP8Lu tCFqbN0FEyWR93RrNz13aHdKcUuvn4j9wgU/ZB275G+cy6K112LRl6RnuAPkensZwWEP NAJA== X-Gm-Message-State: AA+aEWZ5CDOPW56hkBObIpz1OJwe1kvc1gkQJ1FewZPXW0we7Nj7QbWb dk5n7TbEMkRyjARmhhWaKxIqgGXPuRUjiIgKNYVquw== X-Google-Smtp-Source: AFSGD/UVRNslsP7AyBXYD+G0x5YBCsmm7VtTi5TtqH49gFkOi9w8vpLUwZtedHwzoZ5Kam1OUuhe2EQFSHG6k2wmbrA= X-Received: by 2002:a24:edc4:: with SMTP id r187mr7424218ith.158.1545240752880; Wed, 19 Dec 2018 09:32:32 -0800 (PST) MIME-Version: 1.0 References: <20181219170614.12170-1-ard.biesheuvel@linaro.org> <20181219172611.swyseusxz5sllemy@bivouac.eciton.net> In-Reply-To: <20181219172611.swyseusxz5sllemy@bivouac.eciton.net> From: Ard Biesheuvel Date: Wed, 19 Dec 2018 18:32:21 +0100 Message-ID: To: Leif Lindholm Cc: "edk2-devel@lists.01.org" Subject: Re: [PATCH edk2-platforms] Platform/AMD/OverdriveBoard: build capsule unconditionally X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Dec 2018 17:32:34 -0000 Content-Type: text/plain; charset="UTF-8" On Wed, 19 Dec 2018 at 18:26, Leif Lindholm wrote: > > On Wed, Dec 19, 2018 at 06:06:14PM +0100, Ard Biesheuvel wrote: > > Remove the DO_CAPSULE conditionals so that the capsules are > > always built. This fixes a build issue that exists currently, > > since the IPv6 enabled version of IScsiDxe that we now include > > depends on a library class that can only be resolved if building > > with DO_CAPSULE=TRUE. > > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Ard Biesheuvel > > Reviewed-by: Leif Lindholm > Thanks! Pushed as 54a0e7ae1289..c955b5129771 > > --- > > Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 9 --------- > > Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 9 --------- > > 2 files changed, 18 deletions(-) > > > > diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc > > index 3d0544cf74cd..49671eefbdea 100644 > > --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc > > +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc > > @@ -19,7 +19,6 @@ > > > > DEFINE NUM_CORES = 8 > > DEFINE DO_FLASHER = FALSE > > -DEFINE DO_CAPSULE = FALSE > > > > PLATFORM_NAME = Overdrive > > PLATFORM_GUID = B2296C02-9DA1-4CD1-BD48-4D4F0F1276EB > > @@ -124,14 +123,12 @@ DEFINE DO_CAPSULE = FALSE > > > > CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf > > DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.inf > > -!if $(DO_CAPSULE) == TRUE > > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > > IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > > EdkiiSystemCapsuleLib|SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.inf > > FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf > > IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf > > PlatformFlashAccessLib|Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf > > -!endif > > > > TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > > @@ -492,8 +489,6 @@ DEFINE DO_CAPSULE = FALSE > > gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0x0 > > gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0x0 > > > > -!if $(DO_CAPSULE) == TRUE > > - > > [PcdsDynamicExDefault.common.DEFAULT] > > gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareImageDescriptor|{0x0}|VOID*|0x100 > > > > @@ -503,8 +498,6 @@ DEFINE DO_CAPSULE = FALSE > > # d34b3d29-0085-4ab3-8be8-84188cc50489 > > gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{0x29, 0x3d, 0x4b, 0xd3, 0x85, 0x0, 0xb3, 0x4a, 0x8b, 0xe8, 0x84, 0x18, 0x8c, 0xc5, 0x04, 0x89} > > > > -!endif > > - > > [PcdsDynamicHii] > > gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 > > > > @@ -761,7 +754,6 @@ DEFINE DO_CAPSULE = FALSE > > } > > !endif > > > > -!if $(DO_CAPSULE) == TRUE > > # > > # Firmware update > > # > > @@ -769,4 +761,3 @@ DEFINE DO_CAPSULE = FALSE > > SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf > > SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf > > Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf > > -!endif > > diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf > > index 840b3d0313f3..4b6b808c1454 100644 > > --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf > > +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf > > @@ -252,13 +252,11 @@ READ_LOCK_STATUS = TRUE > > # > > INF Silicon/AMD/Styx/Drivers/StyxRngDxe/StyxRngDxe.inf > > > > -!if $(DO_CAPSULE) == TRUE > > # > > # Firmware update > > # > > INF MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf > > INF SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf > > -!endif > > > > [FV.STYX_EFI] > > FvAlignment = 16 > > @@ -288,10 +286,7 @@ READ_LOCK_STATUS = TRUE > > INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf > > INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf > > INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf > > - > > -!if $(DO_CAPSULE) == TRUE > > INF RuleOverride = FMP_IMAGE_DESC Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf > > -!endif > > > > FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 { > > SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE { > > @@ -299,8 +294,6 @@ READ_LOCK_STATUS = TRUE > > } > > } > > > > -!if $(DO_CAPSULE) == TRUE > > - > > [FV.CapsuleDispatchFv] > > FvAlignment = 16 > > ERASE_POLARITY = 1 > > @@ -369,8 +362,6 @@ CAPSULE_HEADER_INIT_VERSION = 0x1 > > > > FMP_PAYLOAD = FmpPayloadSystemFirmwarePkcs7 > > > > -!endif > > - > > ################################################################################ > > # > > # Rules are use with the [FV] section's module INF type to define > > -- > > 2.19.2 > >