From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <sami.mujawar@arm.com>
Received-SPF: Pass (sender SPF authorized) identity=mailfrom;
 client-ip=217.140.96.140; helo=cam-smtp0.cambridge.arm.com;
 envelope-from=sami.mujawar@arm.com; receiver=edk2-devel@lists.01.org 
Received: from cam-smtp0.cambridge.arm.com (fw-tnat.cambridge.arm.com
 [217.140.96.140]) (using TLSv1 with cipher AES256-SHA (256/256 bits))
 (No client certificate requested)
 by ml01.01.org (Postfix) with ESMTPS id 08F452035D6B5
 for <edk2-devel@lists.01.org>; Thu, 26 Apr 2018 04:16:55 -0700 (PDT)
Received: from E107187.Emea.Arm.com (e107187.emea.arm.com [10.1.211.22])
 by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id w3QBGnh5011030;
 Thu, 26 Apr 2018 12:16:50 +0100
From: Sami Mujawar <sami.mujawar@arm.com>
To: edk2-devel@lists.01.org
Cc: Arvind Chauhan <Arvind.Chauhan@arm.com>,
 Daniil Egranov <Daniil.Egranov@arm.com>,
 Thomas Panakamattam Abraham <thomas.abraham@arm.com>,
 ard.biesheuvel@linaro.org, leif.lindholm@linaro.org,
 Matteo.Carlini@arm.com, Stephanie.Hughes-Fitt@arm.com, nd@arm.com,
 evan.lloyd@arm.com, alexei.fedorov@arm.com, michael.d.kinney@intel.com
Date: Thu, 26 Apr 2018 12:16:44 +0100
Message-Id: <20180426111644.25624-1-sami.mujawar@arm.com>
X-Mailer: git-send-email 2.11.0.windows.3
Subject: [PATCH 3/3] Platform/ARM: Fix NOR Flash dependency for CTA15A7
X-BeenThere: edk2-devel@lists.01.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: EDK II Development  <edk2-devel.lists.01.org>
List-Unsubscribe: <https://lists.01.org/mailman/options/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=unsubscribe>
List-Archive: <http://lists.01.org/pipermail/edk2-devel/>
List-Post: <mailto:edk2-devel@lists.01.org>
List-Help: <mailto:edk2-devel-request@lists.01.org?subject=help>
List-Subscribe: <https://lists.01.org/mailman/listinfo/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2018 11:16:56 -0000

The correct load order for the NOR Flash driver and Runtime Variables
to work is as below:
    1. Arm CPU Architecture Protocol Dxe
    2. NOR Flash Dxe
    3. Runtime Variable Dxe

NvVarStoreFormattedLib was recently introduced to resolve the dependency
order and more details can be seen at
https://github.com/tianocore/edk2/compare/master...lersek:depex_fixes

This patch propagates the necessary changes for ARM VExpress CTA15+A7
platform and also fixes the "Firmware Volume for Variable Store is
corrupted" error seen when the Flash is erased (or not formatted).

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
Signed-off-by: Alexei Fedorov <alexei.fedorov@arm.com>
---
The changes can be seen at:
https://github.com/samimujawar/edk2-platforms/tree/255_firmware_volume_issue_v1

Notes:
    v1:
    - Fixed firmware volume variable store corrupt issue.           [SAMI]

 Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
index 6c6c8d3938e61abf7456b4c2cd6b464c0238353b..8f35b8a4a958867066d4e08bcc5dba7793e5f52d 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
@@ -215,6 +215,7 @@ [Components.common]
   MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
     <LibraryClasses>
       NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
+      NULL|EmbeddedPkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.inf
       BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
   }
   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'