[PATCH 3/3] Platform/ARM: Fix NOR Flash dependency for CTA15A7

[PATCH 3/3] Platform/ARM: Fix NOR Flash dependency for CTA15A7

[Sami Mujawar]

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)'