Platform/ARM: Fix BootMonFS device path

The NOR Flash driver was recently moved from the Tianocore\edk2 repository to the Tianocore\edk2-platforms repository at the following location: Platform\ARM\Drivers\NorFlashDxe\NorFlashDxe.inf As part of this move the FILE_GUID for the NorFlashDxe.inf at the new location was also updated from: 93E34C7E-B50E-11DF-9223-2443DFD72085 to: DE6AE758-D662-4E17-A97C-4C5964DA4C41 Correspondingly, the device paths for the BootMonFs also requires to be updated in gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths so that the file system is correctly mounted. Therefore, update the BootMonFS device path for the platforms that utilise it. Reported-by: Sudeep Holla <[email protected]> Signed-off-by: Sami Mujawar <[email protected]> Tested-by: Sudeep Holla <[email protected]>
pbgrimes · Feb 3, 2023 · c855d03 · c855d03
1 parent 878c4b1
commit c855d03
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Platform/ARM/JunoPkg/ArmJuno.dec b/Platform/ARM/JunoPkg/ArmJuno.dec
@@ -41,7 +41,7 @@
   gArmJunoTokenSpaceGuid.PcdSynopsysUsbEhciBaseAddress|0x7FFC0000|UINT32|0x00000005
 
   # Juno Device Trees are loaded from NOR Flash
-  gArmJunoTokenSpaceGuid.PcdJunoFdtDevicePath|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00)/board.dtb"|VOID*|0x00000008
+  gArmJunoTokenSpaceGuid.PcdJunoFdtDevicePath|L"VenHw(DE6AE758-D662-4E17-A97C-4C5964DA4C41,00)/board.dtb"|VOID*|0x00000008
 
   # MHU Register base used by SCMI Mailbox transport
   gArmJunoTokenSpaceGuid.PcdArmMtlDoorBell|0x2B1F0000|UINT64|0x00000024

diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc
@@ -183,7 +183,7 @@
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24
 
   # List of Device Paths that support BootMonFs
-  gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00)"
+  gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(DE6AE758-D662-4E17-A97C-4C5964DA4C41,00)"
 
   #
   # ARM Architectural Timer Frequency

diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
@@ -170,7 +170,7 @@
 
 
   # List of Device Paths that support BootMonFs
-  gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00)"
+  gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(DE6AE758-D662-4E17-A97C-4C5964DA4C41,00)"
 
   # ARM OS Loader
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3

diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
@@ -164,7 +164,7 @@
   #
   # Define the device path to the FDT for the platform
   #
-  gFdtPlatformDxeTokenSpaceGuid.PcdFdtDevicePaths|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00)/ca15a7"
+  gFdtPlatformDxeTokenSpaceGuid.PcdFdtDevicePaths|L"VenHw(DE6AE758-D662-4E17-A97C-4C5964DA4C41,00)/ca15a7"
 
   #
   # ARM Architectural Timer Frequency

diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -380,7 +380,7 @@
   #
 
   # List of Device Paths that support BootMonFs
-  gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00);VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,02)"
+  gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(DE6AE758-D662-4E17-A97C-4C5964DA4C41,00);VenHw(DE6AE758-D662-4E17-A97C-4C5964DA4C41,02)"
 
   # RunAxf support via Dynamic Shell Command protocol
   # We want to use the Shell Libraries but don't want it to initialise