[PATCH edk2-platforms v1 1/1] Platform/ARM: Fix BootMonFS device path

[PATCH edk2-platforms v1 1/1] Platform/ARM: Fix BootMonFS device path

[Sami Mujawar]

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 <Sudeep.Holla@arm.com>
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
The changes can be seen at:
https://github.com/samimujawar/edk2-platforms/tree/2568_fix_bootmonfs_path_v1

 Platform/ARM/JunoPkg/ArmJuno.dec                  | 2 +-
 Platform/ARM/JunoPkg/ArmJuno.dsc                  | 2 +-
 Platform/ARM/SgiPkg/SgiPlatform.dsc.inc           | 2 +-
 Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 2 +-
 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Platform/ARM/JunoPkg/ArmJuno.dec b/Platform/ARM/JunoPkg/ArmJuno.dec
index b6437d6fe98cc80c71cbe4dd763d920864458971..5ca42a6997ce1d477086ed8d84cd9241eb59e89b 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.dec
+++ b/Platform/ARM/JunoPkg/ArmJuno.dec
@@ -41,7 +41,7 @@ [PcdsFixedAtBuild.common]
   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
index a00b866c5e9a775e360900ed72cc66bb8e3b0f08..14777d2082e325b0b05e8988cfe9c92df6e896b9 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.dsc
+++ b/Platform/ARM/JunoPkg/ArmJuno.dsc
@@ -183,7 +183,7 @@ [PcdsFixedAtBuild.common]
   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
index a21faa249b07e6d3430645542ff6bb891239654c..26ecd9ed59a715c33589b41045182a0a3ced3e27 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
+++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
@@ -170,7 +170,7 @@ [PcdsFixedAtBuild.common]
 
 
   # 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
index 5b0a929b6b25b552ef26b781906439a3b3f15ce4..6495e08db5906958892f68b911d9466fcde748fd 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
@@ -164,7 +164,7 @@ [PcdsFixedAtBuild.common]
   #
   # 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
index 81d35fb805c6b946d345b7f0fe8dae336e9be5bd..5e6886b30c8e507939a73b97366e2247a1430cef 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -380,7 +380,7 @@ [PcdsFixedAtBuild.common]
   #
 
   # 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
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

Re: [PATCH edk2-platforms v1 1/1] Platform/ARM: Fix BootMonFS device path

[Ard Biesheuvel]

On Thu, 2 Feb 2023 at 12:28, Sudeep Holla <sudeep.holla@arm.com> wrote:
>
> On Thu, Feb 02, 2023 at 11:21:38AM +0000, Sami Mujawar wrote:
> > 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 <Sudeep.Holla@arm.com>
>
> Tested-by: Sudeep Holla <Sudeep.Holla@arm.com>
>

Merged as c855d03384f84413c51ae082de2ecd19f9e8d844

Apologies for the breakage

-- 
Ard.