From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::441; helo=mail-wr1-x441.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) (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 F1DA621959CB2 for ; Fri, 8 Mar 2019 07:31:30 -0800 (PST) Received: by mail-wr1-x441.google.com with SMTP id o17so21825061wrw.3 for ; Fri, 08 Mar 2019 07:31:30 -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=GRXY9yq8D4Ba8DOvjweHhJ6FusVMztrvRUib4X/N76o=; b=RcNPateHvQ7uKNGUsH0jGqSmRDThdBlFSSUJlAbZihNhUyW7VJ9aE7SxzQl0n7nzKM a8a5ev/qK/oaOtQnLHKe1hVT+9sljPt78wci+uxzRTKvbs9ONWpFONHLd8io/fzPPUtP hHf1J47R0y4XO/pTxCn5r9wypZGxUMo0NbOh+WpmknsoIcxchSzuK/coiYKiaeR2EGm2 qOEt2LHKC757pLN5ZvuVSg2ON3anfN7CCraxyP0KuzFOzIJbOqi7tRrdExGyvQA6EzyT TssCKDP5iWjX5i8FhKViX2jfbikcBwgYU8hSC95u4VNRRWnfTrCIiwvU+c5UqgEjJkNK U7vw== 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=GRXY9yq8D4Ba8DOvjweHhJ6FusVMztrvRUib4X/N76o=; b=L1mO+EHeSIgcD1cPhkJPvTiyLR9W07TucOkmDz8EjflKwz2+drE+rR53tNNNuXQred Kntq5RC57ULLV20GrmTgyBJWt0Z0jCqBSywBszB92x5s8wRlLHaVjqdfvUmjCSFZFDzT 0e70rZdySYsWBw9jP8PiAzYjXZGYxAFj1vuR05izNcLz0dlSbAKEojuQypjftC5liZLO 1wcxWmCu6Aw/PtzJFPHbCpIWZjZJBZAeFaDqCilRcuJPGBZu+yVKZAXCgBgNH6vRsgA5 ZEbK2oPUoPBzhPM+rqlnotp8/O5XAgkfSqQc9FcZita2EAA5GS8iu4/plc/4f3XBNKXU ciMQ== X-Gm-Message-State: APjAAAWyQ4Re0mLsp7EC1qt1Tx73TWV3Te52IYMGG4gCTUTkL0QKrWUe cgNsqBmBE9JEUik9j6rIbu7EUoTQYTo= X-Google-Smtp-Source: APXvYqww7pIN5sS1KU3WgSnCqGfn9HkptugU12g0yU3ULLJXmRZKOBpea5JzbcAfZ2xC3eMn/qL0pw== X-Received: by 2002:a5d:4a8a:: with SMTP id o10mr11462938wrq.189.1552059088496; Fri, 08 Mar 2019 07:31:28 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 07:31:27 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Fri, 8 Mar 2019 16:30:09 +0100 Message-Id: <20190308153010.18486-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [PATCH edk2-platforms 1/2] Platform/ARM/SgiPkg: 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: , X-List-Received-Date: Fri, 08 Mar 2019 15:31:31 -0000 Content-Transfer-Encoding: 8bit Bring SgiPkg in line with EDK2 core changes to StandaloneMmPkg: - add a resolution for ExtractGuidedSectionLib - remove reference to gStandaloneMmPkgTokenSpaceGuid.PcdStandaloneMmEnable - update the resolution of StandaloneMmDriverEntryPoint Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc index 65dd6ac82c4a..ef16bfa9a20e 100644 --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc +++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc @@ -43,6 +43,7 @@ BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf + ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf FvLib|StandaloneMmPkg/Library/FvLib/FvLib.inf HobLib|StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf @@ -56,7 +57,7 @@ # # Entry point # - StandaloneMmDriverEntryPoint|StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf + StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf @@ -81,9 +82,6 @@ # Pcd Section - list of all EDK II PCD Entries defined by this Platform # ################################################################################ -[PcdsFeatureFlag] - gStandaloneMmPkgTokenSpaceGuid.PcdStandaloneMmEnable|TRUE - [PcdsFixedAtBuild] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x800000CF gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xff @@ -93,6 +91,8 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x7FF70000 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200 + gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x2 + ################################################################################################### # # Components Section - list of the modules and components that will be processed by compilation -- 2.20.1