From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.groups.io with SMTP id smtpd.web09.54.1628613649528137801 for ; Tue, 10 Aug 2021 09:40:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=YzBxou6Y; spf=pass (domain: linaro.org, ip: 209.85.128.42, mailfrom: etienne.carriere@linaro.org) Received: by mail-wm1-f42.google.com with SMTP id g138so1677039wmg.4 for ; Tue, 10 Aug 2021 09:40:49 -0700 (PDT) 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; bh=8VXo2qjPv6tsx7E/K6Qm4Bk+lyGoppCf+SsPdhsC4bk=; b=YzBxou6YgRAOCMoagPeE+wrC0UdJB+31PMvUOI8bIKQFPB3uLUnlHn5QZnMwwxo37A w8ACHUWZAE5eR2Fs36Z9eO5s/ZJ3CHeYtydjRCBJPhCgmWrTwftNh/ZIx2bNMkG2A2Xv Xwg7YjU6Acm1Oel5s/m1+TOIa9yn45sN7nYNmOdEXcIbyaBdkszvw4uBRlWmQ07wlKLI KmI7PDdHJ8+OVQ0CkoNuQxMY5AOxX696DU3mKEY9wonUIJNWedS6j5F9EJ8kwfx4WnN9 f3rWkJI4Nh8JW7aGkUnR+lFb3B0hYcuviKfa5LVeM6BEKwwAdIsNNGDaSCY7/sx9rKKs M+iQ== 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; bh=8VXo2qjPv6tsx7E/K6Qm4Bk+lyGoppCf+SsPdhsC4bk=; b=B8cYiWocgyOcX2uJyfEixlviCnf0WQzAoL4uyp6RbuLRDGFdsuRPGW+RFu0FDgL9G1 cJ0q04E2ipcgv4LDLuxKw/GVb8iSGQKf4un4j6KDeBOlP4T6Ysushtf6vf/mqo/mB64D 3fJlrV0I9xHMv4U6NZs2VWHdHTmseGq7zJ5WHw9ewLhOzvOyTlPD18TN+ssx1Q+dWtpT g0Q6kKQW3ScaKkM8rXQssJaaiJ0FsCayaU+R865JlUEAYAhqCfZLjWYnV++/lzwhlgEm OUff+tklpZkN183dU2h8vVMBrh9ogyyfESsuwJjtFFgrkmATgtHfVdGlcc2u2tXYnzIl e4Tw== X-Gm-Message-State: AOAM532R+GHffu70EXtKBhTtWFPAUd/WW6yZ2e+GkW+SFl5IEbw1EC1q qR8alRd2bW7OxlBKRTE6mxFfVg+I/LrPcg== X-Google-Smtp-Source: ABdhPJxMPrckBj+3IAZjTArluXEzxreBqpMnn3eOGOLZGMr+3J4TsbYDKfHCSnYBk9thfPmSn6nxaA== X-Received: by 2002:a05:600c:896:: with SMTP id l22mr5682299wmp.68.1628613648058; Tue, 10 Aug 2021 09:40:48 -0700 (PDT) Return-Path: Received: from lmecxl0524.lme.st.com ([2a04:cec0:10c1:ef71:f5e6:d24:9eea:1973]) by smtp.gmail.com with ESMTPSA id i3sm3196261wmb.17.2021.08.10.09.40.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 09:40:47 -0700 (PDT) From: "Etienne Carriere" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Ilias Apalodimas , Leif Lindholm , Sami Mujawar , Sughosh Ganu , Thomas Abraham , Etienne Carriere Subject: [PATCH v3 1/6] Platform/ARM/SgiPkg: sync with edk2 StandaloneMmCpu path change Date: Tue, 10 Aug 2021 18:40:31 +0200 Message-Id: <20210810164036.15199-2-etienne.carriere@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210810164036.15199-1-etienne.carriere@linaro.org> References: <20210810164036.15199-1-etienne.carriere@linaro.org> Synchronize with edk2 package where StandaloneMmCpu component has moved from StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf to StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf Cc: Ard Biesheuvel Cc: Ilias Apalodimas Cc: Leif Lindholm Cc: Sami Mujawar Cc: Sughosh Ganu Cc: Thomas Abraham Signed-off-by: Etienne Carriere --- Changes since v2: - Fix StandaloneMmCpu.inf path required when rebasing the patch. Changes since v1: - split change in 3: this change relates to Platform/ARM/SgiPkg only. --- Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf | 2 +- Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf b/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf index 474c9c0ce7..c1c24b747f 100644 --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf +++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf @@ -54,7 +54,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandaloneMm.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf !endif - INF StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf + INF StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf ################################################################################ # diff --git a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc index 2b461d5afb..5287e1f8e5 100644 --- a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc +++ b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc @@ -119,7 +119,7 @@ StandaloneMmPkg/Core/StandaloneMmCore.inf [Components.AARCH64] - StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf + StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf !if $(SECURE_STORAGE_ENABLE) == TRUE ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashStandaloneMm.inf MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandaloneMm.inf -- 2.17.1