Platform/ARM: switch to local version of NorFlashDxe drivers

Drop the dependency on the ArmPlatformPkg version of NorFlashDxe and
NorFlashStandaloneMm, which will be going away soon. Instead, depend on
the local version under Platform/ARM.

Signed-off-by: Ard Biesheuvel <[email protected]>
Reviewed-by: Sami Mujawar <[email protected]>

Author: ardbiesheuvel

Platform/ARM/JunoPkg/ArmJuno.dsc

@@ -277,7 +277,7 @@
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
 
   ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
-  ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
+  Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf
   ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.inf
 

Platform/ARM/JunoPkg/ArmJuno.fdf

@@ -136,7 +136,7 @@ FvNameGuid         = B73FE497-B92E-416e-8326-45AD0D270092
   INF ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.inf
 
   # NOR Flash driver
-  INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
+  INF Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf
 
   # Versatile Express FileSystem
   INF Platform/ARM/Drivers/BootMonFs/BootMonFs.inf

Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf

@@ -50,7 +50,7 @@ READ_LOCK_STATUS   = TRUE
 
   INF StandaloneMmPkg/Core/StandaloneMmCore.inf
 !if $(SECURE_STORAGE_ENABLE) == TRUE
-  INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashStandaloneMm.inf
+  INF Platform/ARM/Drivers/NorFlashDxe/NorFlashStandaloneMm.inf
   INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandaloneMm.inf
   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf
 !endif

Platform/ARM/SgiPkg/SgiPlatform.dsc.inc

@@ -256,7 +256,7 @@
 !if $(ENABLE_GOP) == TRUE
   ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
 !endif
-  ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
+  Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf
   EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
   EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf

Platform/ARM/SgiPkg/SgiPlatform.fdf

@@ -149,7 +149,7 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
 
   # NOR Flash driver
-  INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
+  INF Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
 
   # Graphics Output Protocol

Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc

@@ -122,7 +122,7 @@
 [Components.AARCH64]
   StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
 !if $(SECURE_STORAGE_ENABLE) == TRUE
-  ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashStandaloneMm.inf
+  Platform/ARM/Drivers/NorFlashDxe/NorFlashStandaloneMm.inf
   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandaloneMm.inf
   MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf {
     <LibraryClasses>

Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc

@@ -229,7 +229,7 @@
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
 
   ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
-  ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
+  Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf
   ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf
   ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf

Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf

@@ -90,7 +90,7 @@ FvNameGuid         = 73dcb643-3862-4904-9076-a94af1890243
 
   INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
-  INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
+  INF Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf
   INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
   INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
 

Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc

@@ -289,7 +289,7 @@
   }
 
   ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
-  ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
+  Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf
 !ifdef EDK2_ENABLE_PL111
   ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf

Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf

@@ -112,7 +112,7 @@ FvNameGuid         = 87940482-fc81-41c3-87e6-399cf85ac8a0
 
   INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
-  INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
+  INF Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf
 !ifdef EDK2_ENABLE_PL111
   INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
 !endif