From patchwork Fri Mar 8 15:30:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 159991 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp8851444jad; Fri, 8 Mar 2019 07:31:34 -0800 (PST) X-Google-Smtp-Source: APXvYqw2sWTzmGlqeXyi91Zft+m38T6I2SH5IYqq9nZ39bko1JOravQTx2uMi9fX/kwFkh2X2EJv X-Received: by 2002:a62:168a:: with SMTP id 132mr19140730pfw.155.1552059094003; Fri, 08 Mar 2019 07:31:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1552059093; cv=none; d=google.com; s=arc-20160816; b=VH80wyVJP9wwyBMiKTIHu/XBqL+bYXwjwwMK4/0L40ArwEoRyGfse+/A0NH08cqw6J wk9U/QYcGs+H8NlOPRLPnyN+JkwwUPBOM8sVphJrEmkBFPIa5B0G4Dft5g2ncJAStJmG e9BxKaJXyP9RcR4ctKp+V94H3AS2u9yKt4AgmVk1Av9tpEJY1ftreXaMILECUGUoc0JF cGhgXPjo5RK7bc2bqTG0wPMvV1or8rf/F6/xNOPUOkRRB51pBfVkXSS4dqOuNbzFyiTz edXBUZhNyCkI9WRP+3Wh063ABlvrECXWsrmVclNBzqBL3HKX2HxQG4P7W4/KtpEJ2AZV lUHg== 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:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=U8xBXfRJG7Ux9S8oeEqnSnUscy2fCp/OLjEAFp5MdwE=; b=UfpAboz9oWLBmG+Rp/nphyJx1Z3q+dXTuS/gobW8WQitm4nPO5wQYPwhpChmHgS6SV I7F1bPk+i/kpdG30TaH5HpqqOgUdtFLh4A5zaSqPF14WTzw9W5Th068c1d+T36vz9d+i ZyHw7ldVAkLIHKB4BI6pmnjrOJQGfDfLkteq6cYzC0lTbqfcI1qV2yEGvdp1slAG6/51 kRgL7zUlOVs3G4TmVf2nT7EmaO+lu7iFwxXYzLaolxb76hhcVwCd3p24yu4jnxmxFBml aBnc0RnnNOovRvSZRYSiY6DetHdhPGXjA5qgUG7sxIwD15o+vKIkS5bukawX0Dz4YdDa flaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=FzNHmT9x; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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. [198.145.21.10]) by mx.google.com with ESMTPS id i65si7229912pfj.105.2019.03.08.07.31.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 07:31:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=FzNHmT9x; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 3577D211D617E; Fri, 8 Mar 2019 07:31:33 -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::342; helo=mail-wm1-x342.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) (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 EB995211D59B9 for ; Fri, 8 Mar 2019 07:31:31 -0800 (PST) Received: by mail-wm1-x342.google.com with SMTP id f3so13039391wmj.4 for ; Fri, 08 Mar 2019 07:31:31 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=R//aW6pdTwQZUovx0LsNylb1LyeyLXjyAWTAACGhPlQ=; b=FzNHmT9xjsr1y7NdoHTdQ6UrqM4I45z/ieStRlE8cbGGLPRWTjX42kn/YG+ee1lJiK 75C8l88oPHwwYck2HI5VLwAEfwJwlLyKcbS7PLD1Nw+npAXmINsY8h5wBf91CvKwHxPR h81mUJR1je1jl6MtOXzoQwlAAbwlk6YlhHKKxFkAK493eqt4ngJYLQmmDXZ62oBkShU2 rBRFYowsEzX+x2qegV5v8ywLnqwQVivgrpA3ZYG59oWAfVdgb2mTNNYe7P2bA5cksn4U zZ0XVxp+vYC/BcXNfd1rkZKRiMkH4OAPURfrF25wWqk3oWQEAaGtbJLkZSWC3EDRR9Pd XfkA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=R//aW6pdTwQZUovx0LsNylb1LyeyLXjyAWTAACGhPlQ=; b=DE1QsDztXx/E1tWt0q9qYrhccIAuFQ93YR38damRA7FY9m7u4NQMTHH1DYsJHoUnA0 TGVgPHx+Abz6HIPpeJQk9UQ/c1eP4Fiwf3ax7IUNTpCUQ1p1TfybeVOc7l14v0eKT9eJ juoluUIRdoTG8uMRyYR/4ZAG1t62Eb1rOqM5ZkRKRIhlOSIRW+TL1rBiurOfuxhwQU2p l0tc0LfbJ1w7wb+B7PfhFx9b1/pTE9LEY9x/ifZYNw0v574sL8mkK72kSAsclr9N6N44 q3c8TDzS+0m1aLRt1eI5Atrr1kSzI8UBDP/JD7VE4HvEaw7GOsBVopIVZ7GqVHeljfRG IoKw== X-Gm-Message-State: APjAAAXSgX91Lu/stQkPhkzcPvEnZVhxTBomklt17glLlpMhh2oKRQGV xqiOYa9k9ZkSZUxW65PqORnZ/oIoYsI= X-Received: by 2002:a1c:44d7:: with SMTP id r206mr9834169wma.40.1552059089916; Fri, 08 Mar 2019 07:31:29 -0800 (PST) Received: from localhost.localdomain (laubervilliers-657-1-83-120.w92-154.abo.wanadoo.fr. [92.154.90.120]) by smtp.gmail.com with ESMTPSA id g15sm723995wrw.78.2019.03.08.07.31.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 07:31:28 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Fri, 8 Mar 2019 16:30:10 +0100 Message-Id: <20190308153010.18486-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190308153010.18486-1-ard.biesheuvel@linaro.org> References: <20190308153010.18486-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-platforms 2/2] Platform/Socionext/DeveloperBox: align with upstream StandaloneMmPkg changes 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" Bring DeveloperBox in line with EDK2 core changes to StandaloneMmPkg: - switch from BaseExtractGuidedSectionLib to PrePiExtractGuidedSectionLib - include a NULL library class resolution for VariableMmDependency Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 5 ++++- Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc | 7 +++---- 2 files changed, 7 insertions(+), 5 deletions(-) -- 2.20.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc index 31afc4aac3c4..39077ab5ee79 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc @@ -293,7 +293,10 @@ VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf } !else - ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf + ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf { + + NULL|StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf + } MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf !endif diff --git a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc index 55c5fbb7350d..141b175047b2 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc +++ b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc @@ -68,9 +68,6 @@ [PcdsFixedAtBuild] gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x51040000 -[PcdsPatchableInModule] - gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress|0x0 - ################################################################################ # # Components Section - list of all EDK II Modules needed by this Platform @@ -82,8 +79,10 @@ # StandaloneMmPkg/Core/StandaloneMmCore.inf { - ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf + ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + + gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x2 } StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf