From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mx.groups.io with SMTP id smtpd.web08.919.1635884513254379289 for ; Tue, 02 Nov 2021 13:21:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@corthon-com.20210112.gappssmtp.com header.s=20210112 header.b=Bx1t/D0l; spf=none, err=permanent DNS error (domain: corthon.com, ip: 209.85.210.178, mailfrom: bret@corthon.com) Received: by mail-pf1-f178.google.com with SMTP id y20so117094pfi.4 for ; Tue, 02 Nov 2021 13:21:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corthon-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ud70/bohYJObwJtG3HSanS0HD4MLfwzwP6jq+u83Hkk=; b=Bx1t/D0l+/3AFnPqKBb9GIFH1UrDYSoqOEe8DobCBCHle1RwWdri87HsYKqAFXz/WV 4fzRbFAUC/AUYPabei+fLZLWg+wZ+qP7HrWqqfpgJeq1NRkjFwonywbBSSdinYs2//sL npaJgt4pcJ3AlBddEUAI7Jt27+GjGlIUQL5MB+4A2hLw8P7qeo0a3bT7zQwtCvMRZj6L bxSIqsNhEqbKn+hIFQjeFastNMbn87eOy3mD++fANgtuXgFaXv2uAobUB0nyOyJ/FsMV vT7AdWLK1hY7BC7vW9CNP+lGTm1cHvaT5Zag+3mhrT08xh5A+nW1xDJuU9fmP2NYqab3 uhMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ud70/bohYJObwJtG3HSanS0HD4MLfwzwP6jq+u83Hkk=; b=HVitiuVdz7f96jDPFPT7VgFy5GagkBhkj/zkS2vA1W97BYXg1tPYRhG6OtOPq+7Bfh kOto8HKfktbVIsAiesC3KVRqtvm2cVnzjfAgabrKZ5gjXifKen/UaVkum8/9mIhfeMZz 6DG0wveq/7gHXdbGljxfT2LsBkL4ahL/r48yDiht86msMeITRBg7+kpFbX4N8Ry1fGf7 GSNnma7nXrLbvPsk27+qvlWRLweDyTRsPzjZaKBQ3yDNsi6nuqTooG1ymHCr2vn3Gl43 lS8dDiATHnGJDX/+B7qJQf+b2jy8an2lbCmQGFaeNO20KmLIPzK8kXTdwD6cfn+ziIcI 0FYA== X-Gm-Message-State: AOAM530aAWCgaX3iwxWLj1ewhzPOrWkPuGCJc+LdzUsmgo3OJibqW4O3 tQMwt38HWZiydwo8snodZ3EAUZ8VPySTHs5P X-Google-Smtp-Source: ABdhPJycDmVqhfjRFw3wkxZ/xsmule5ebbBgPg80NvfU4Hn8amc6jW+Htkqi73d2HPuyTjFAT9xZ5w== X-Received: by 2002:a05:6a00:b4c:b0:481:2a:f374 with SMTP id p12-20020a056a000b4c00b00481002af374mr19207327pfo.60.1635884512491; Tue, 02 Nov 2021 13:21:52 -0700 (PDT) Return-Path: Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.21.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:21:52 -0700 (PDT) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Sami Mujawar , Jiewen Yao , Supreeth Venkatesh , Sean Brogan Subject: [PATCH v2 13/16] ArmPkg: Move the StandaloneMmCoreEntryPoint lib to ArmPkg Date: Tue, 2 Nov 2021 13:17:45 -0700 Message-Id: <20211102201748.1963-14-brbarkel@microsoft.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-1-brbarkel@microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Bret Barkelew This aligns better with Mu's philosophy around dependency structuring and is one of the steps to enable Basecore to have zero CI dependencies on other Mu repos. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3652 Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Sami Mujawar Cc: Jiewen Yao Cc: Supreeth Venkatesh Cc: Sean Brogan Signed-off-by: Bret Barkelew --- {StandaloneMmPkg =3D> ArmPkg}/Library/StandaloneMmCoreEntryPoint/Arm/Creat= eHobList.c | 0 {StandaloneMmPkg =3D> ArmPkg}/Library/StandaloneMmCoreEntryPoint/Arm/SetPe= rmissions.c | 0 {StandaloneMmPkg =3D> ArmPkg}/Library/StandaloneMmCoreEntryPoint/Arm/Stand= aloneMmCoreEntryPoint.c | 0 {StandaloneMmPkg =3D> ArmPkg}/Library/StandaloneMmCoreEntryPoint/X64/Stand= aloneMmCoreEntryPoint.c | 0 ArmPkg/ArmPkg.ci.yaml = | 3 ++- ArmPkg/ArmPkg.dsc = | 3 +++ {StandaloneMmPkg =3D> ArmPkg}/Library/StandaloneMmCoreEntryPoint/Standalon= eMmCoreEntryPoint.inf | 0 7 files changed, 5 insertions(+), 1 deletion(-) diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateH= obList.c b/ArmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHobList.c similarity index 100% rename from StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHo= bList.c rename to ArmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHobList.c diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPerm= issions.c b/ArmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissions.c similarity index 100% rename from StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermi= ssions.c rename to ArmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissions.c diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standal= oneMmCoreEntryPoint.c b/ArmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Stand= aloneMmCoreEntryPoint.c similarity index 100% rename from StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalo= neMmCoreEntryPoint.c rename to ArmPkg/Library/StandaloneMmCoreEntryPoint/Arm/StandaloneMmCoreEnt= ryPoint.c diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/X64/Standal= oneMmCoreEntryPoint.c b/ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/Stand= aloneMmCoreEntryPoint.c similarity index 100% rename from StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/X64/Standalo= neMmCoreEntryPoint.c rename to ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/StandaloneMmCoreEnt= ryPoint.c diff --git a/ArmPkg/ArmPkg.ci.yaml b/ArmPkg/ArmPkg.ci.yaml index a0d6a75fe881..de6926c82e67 100644 --- a/ArmPkg/ArmPkg.ci.yaml +++ b/ArmPkg/ArmPkg.ci.yaml @@ -46,7 +46,8 @@ "EmbeddedPkg/EmbeddedPkg.dec",=0D "MdeModulePkg/MdeModulePkg.dec",=0D "MdePkg/MdePkg.dec",=0D - "ShellPkg/ShellPkg.dec"=0D + "ShellPkg/ShellPkg.dec",=0D + "StandaloneMmPkg/StandaloneMmPkg.dec"=0D ],=0D # For host based unit tests=0D "AcceptableDependencies-HOST_APPLICATION":[=0D diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index cbc67daa7696..4741a93f609a 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -159,6 +159,9 @@ [Components.common] ArmPkg/Universal/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf=0D ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLibNull.inf=0D =0D + ArmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf=0D + ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf= =0D +=0D [Components.AARCH64]=0D ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf=0D ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf=0D diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneM= mCoreEntryPoint.inf b/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneM= mCoreEntryPoint.inf similarity index 100% rename from StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm= CoreEntryPoint.inf rename to ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPo= int.inf --=20 2.31.1.windows.1