From patchwork Wed Dec 19 17:06:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 154282 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5168406ljp; Wed, 19 Dec 2018 09:06:24 -0800 (PST) X-Google-Smtp-Source: AFSGD/V2JfVzN7oX1eIqMvwZ3Agvtm+FmNScThhqVQ6TrlFWjngauLJGF7QV8jW7Q1nb0hUeUta+ X-Received: by 2002:a63:a611:: with SMTP id t17mr19775773pge.338.1545239184214; Wed, 19 Dec 2018 09:06:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545239184; cv=none; d=google.com; s=arc-20160816; b=gZI9Cf4ompKkFAqsBP7Xlvx9xiAP/S8JgIgsuKMrG4yX7F+tN400EQJA6z8Ue2wBX5 p89FrJZ+XMSl9slSrKlKBSgqwRTyZEfOoKnVIpzJZu7HvKJ4kR2KKgWMAEcXVFAzua2b FpZCR148lzh9B6+YQYkiiGAi6csBCD4GxiOA6fUPuiLhxH/g0B4VH6Z0mS9u5KBUvZLQ THyp7eHUThIdX2CwMjODEuvq4AvcJ7oZyKT/GzDQOutU0Nk0d7x88XwZURQOSel7QUku GL5GXZDAGw74gVkw6T37SgIxJjcpY+eNMrD6PQmLrSxyUvQOqok6QlxIldgHNYoLhq1u 51nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=0T1TN64PghPcVb4zAmq8bahQ/JArRHpEmLhF08tnD+k=; b=o6/iL8VIwPCIkTSS+KXUUnneDZczGw8W1dD42rjJEbkiTqujl8ujsz/72Y0M9v/CsX qDsn9TGX/S7BhCLrZvz6gy69dsolNQbgh+FFjcmPPsM/iTQNuuiLR1JGzdl2L1GJQhDL 9v32Hy264bNZjVq2kFCeVu6wjsEnXfoV8Rg4+XF8T0tEtJhuTSsMwKhxCFvX76tsI2BA Qki5VAp8+57zhEAyCUs+m0hyKDkR6vRS9vD2tMbHxUP//u9s0mKOciE1dzt+oQRs6A/K zjWrba19jDEVafFvvJ2rSaWnrC1WcIuhMJcp4fOkN2Hg820phwfSMcSNu9E4XL7EDrkL xRaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=IlcyMVfs; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id m61si16303733plb.154.2018.12.19.09.06.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Dec 2018 09:06:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=IlcyMVfs; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 5E654211A208B; Wed, 19 Dec 2018 09:06:23 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::442; helo=mail-wr1-x442.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) (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 286102119681D for ; Wed, 19 Dec 2018 09:06:22 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id v13so20264905wrw.5 for ; Wed, 19 Dec 2018 09:06:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+sGHnaF3yvZf3nEuDmU5T83KO+qpz8Zs3SZLxluuKVA=; b=IlcyMVfs7/fxoSV2MmS/6HcdcV1pZnAXpXrHCEz8d1ZZ4zdbcIt4P/+nLM2uLIe6aN OPLD+dq0YULLC4oi+CtpmAbAa7epdknLkEkLpra8ZVNEUFYiMbhqNAtuFYbDd9pFGI6/ ljrzydGefs1G6cP5EQl8VYX2yEyJ67rGgV/yY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+sGHnaF3yvZf3nEuDmU5T83KO+qpz8Zs3SZLxluuKVA=; b=IsarkbAA1HzP6SNSkYJF+sWn+/b16mnv1zWVDlxhm1k+KnFdaWDOYd588le2I1Ijgq C5u81coJzditOnfmkskN7iJnuv9LHX5xBBcyBt6EixOjGIc3SG33FGGVRO55cwmlU3Pz VMQ1UNJX00999LvrrxTr+tiSvEfznwl39Ygd6muu6dS8nkjA6JmaevAeZRLiPn4q6bm5 v5Z28LVESmQPFLV89F4drzttjB8yGTZk8xcU5EJQi1iwbFKB8L99gQNmvJpRhbU0efQ0 CPm5cj8EfPilKDboFkGke9rxU1BjrBlLTNqRgkflH5m+Z4eCbSgTYQF/D/uMKj55sUPc mk2g== X-Gm-Message-State: AA+aEWayKymBjlqW0aEharKKpeV9IT++y3EccxalgLed2QARs47dWpZw PzOnZJM4cFBWZIwHNFmm2IA2WEsG4T6VRRYn X-Received: by 2002:adf:bc02:: with SMTP id s2mr18893817wrg.255.1545239180223; Wed, 19 Dec 2018 09:06:20 -0800 (PST) Received: from localhost.localdomain (aputeaux-685-1-32-226.w90-86.abo.wanadoo.fr. [90.86.239.226]) by smtp.gmail.com with ESMTPSA id d16sm4625409wru.52.2018.12.19.09.06.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Dec 2018 09:06:19 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 19 Dec 2018 18:06:14 +0100 Message-Id: <20181219170614.12170-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Subject: [edk2] [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: , Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 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 --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 9 --------- Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 9 --------- 2 files changed, 18 deletions(-) -- 2.19.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm 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