Platform/SynQuacer: incorporate NOR flash and variable drivers

Wire up the non-volatile EFI variable store support, by switching from
the emulation driver to the real one, and enabling the prerequisite
FTW and NOR flash drivers.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

4 files changed, 51 insertions, 3 deletions

diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
index d11b840304..db8aaf7fdc 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
@@ -341,6 +341,19 @@
   #

   gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE

 

+  #

+  # Variable store

+  #

+  gFip006DxeTokenSpaceGuid.PcdFip006DxeRegBaseAddress|0x54800000

+  gFip006DxeTokenSpaceGuid.PcdFip006DxeMemBaseAddress|0x08000000

+

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x08400000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x00010000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0x08410000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x00010000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x08420000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x00010000

+

 [PcdsPatchableInModule]

   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0

@@ -407,7 +420,6 @@
   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf

   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

   ArmPkg/Drivers/TimerDxe/TimerDxe.inf

-  MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf

   ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.inf

   MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

 

@@ -426,6 +438,22 @@
   }

 

   #

+  # Variable services

+  #

+  Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Dxe.inf {

+    <LibraryClasses>

+      NorFlashPlatformLib|Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQuacerLib.inf

+  }

+  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

+  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {

+    <LibraryClasses>

+      AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf

+      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf

+      TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf

+      VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf

+  }

+

+  #

   # UEFI application (Shell Embedded Boot Loader)

   #

   ShellPkg/Application/Shell/Shell.inf {

diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
index c10e333efd..ac5c458134 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
@@ -1,4 +1,3 @@
-

 #

 #  Copyright (c) 2013-2014, ARM Limited. All rights reserved.

 #  Copyright (c) 2017, Linaro Limited. All rights reserved.

@@ -101,7 +100,6 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf

   INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf

-  INF MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf

   INF ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.inf

   INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

 

@@ -116,6 +114,13 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

 

   #

+  # Variable services

+  #

+  INF Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Dxe.inf

+  INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf

+

+  #

   # UEFI applications

   #

   INF ShellPkg/Application/Shell/Shell.inf

diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c
index 30b42080d5..b682d631d0 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c
@@ -97,6 +97,18 @@ STATIC CONST ARM_MEMORY_REGION_DESCRIPTOR mVirtualMemoryTable[] = {
                      SYNQUACER_PCI_SEG0_PORTIO_MEMSIZE),

   ARM_DEVICE_REGION (SYNQUACER_PCI_SEG1_PORTIO_MEMBASE,

                      SYNQUACER_PCI_SEG1_PORTIO_MEMSIZE),

+

+  // variable store

+  ARM_DEVICE_REGION (FixedPcdGet32 (PcdFip006DxeRegBaseAddress),

+                     EFI_PAGE_SIZE),

+  ARM_DEVICE_REGION (FixedPcdGet32 (PcdFip006DxeMemBaseAddress),

+                     EFI_PAGE_SIZE),

+  ARM_DEVICE_REGION (FixedPcdGet32 (PcdFlashNvStorageVariableBase),

+                     FixedPcdGet32 (PcdFlashNvStorageVariableSize)),

+  ARM_DEVICE_REGION (FixedPcdGet32 (PcdFlashNvStorageFtwWorkingBase),

+                     FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize)),

+  ARM_DEVICE_REGION (FixedPcdGet32 (PcdFlashNvStorageFtwSpareBase),

+                     FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize)),

 };

 

 STATIC

diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.inf b/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.inf
index 161072a33d..db3e3b3792 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.inf
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.inf
@@ -29,6 +29,7 @@
   EmbeddedPkg/EmbeddedPkg.dec

   MdeModulePkg/MdeModulePkg.dec

   MdePkg/MdePkg.dec

+  Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Dxe.dec

   Silicon/Socionext/SynQuacer/SynQuacer.dec

 

 [LibraryClasses]

@@ -53,6 +54,8 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize

+  gFip006DxeTokenSpaceGuid.PcdFip006DxeRegBaseAddress

+  gFip006DxeTokenSpaceGuid.PcdFip006DxeMemBaseAddress

   gSynQuacerTokenSpaceGuid.PcdNetsecEepromBase

 

 [Pcd]