From: "Sami Mujawar" <sami.mujawar@arm.com>
To: <devel@edk2.groups.io>
Cc: Sami Mujawar <sami.mujawar@arm.com>, <ardb+tianocore@kernel.org>,
<thomas.abraham@arm.com>, <Pierre.Gondois@arm.com>,
<Sudeep.Holla@arm.com>, <Matteo.Carlini@arm.com>,
<Akanksha.Jain2@arm.com>, <Ben.Adderson@arm.com>, <nd@arm.com>
Subject: [PATCH edk2-platforms v1 1/1] Platform/ARM: Fix BootMonFS device path
Date: Thu, 2 Feb 2023 11:21:38 +0000 [thread overview]
Message-ID: <20230202112138.40948-1-sami.mujawar@arm.com> (raw)
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)'
next reply other threads:[~2023-02-02 11:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-02 11:21 Sami Mujawar [this message]
[not found] ` <20230202112844.bc7bde7minssk7ug@bogus>
2023-02-03 12:26 ` [PATCH edk2-platforms v1 1/1] Platform/ARM: Fix BootMonFS device path Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230202112138.40948-1-sami.mujawar@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox