ArmPlatformPkg: Give a name to the FV

By default, a MemoryMap() EFI Device Path is created
for the Firmware Volumes.
It means it is difficult to build a Non-Volatile permanent
Device Path for the Firmware Volume as the location in
System Memory may change.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <Olivier.Martin@arm.com>
Reviewed-by: Ronald Cron <Ronald.Cron@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17827 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf
index 5c15fda52a92457de2211a43bd0839ea43443edd..2dbf0e631ff343b592b7b90d49e71933a0be7444 100644 (file)
--- a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf
+++ b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf
@@ -84,6 +84,7 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = B73FE497-B92E-416e-8326-45AD0D270092\r
 \r
   APRIORI DXE {\r
     INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r

diff --git a/ArmPlatformPkg/ArmPlatformPkg-2ndstage.fdf b/ArmPlatformPkg/ArmPlatformPkg-2ndstage.fdf
index aa8661044645f93f6a06f60f5e90efddd84ae814..86a94c19fad57e08c3995a66d74d98691c4312cb 100644 (file)
--- a/ArmPlatformPkg/ArmPlatformPkg-2ndstage.fdf
+++ b/ArmPlatformPkg/ArmPlatformPkg-2ndstage.fdf
@@ -84,6 +84,7 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c\r
 \r
   INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
 \r

diff --git a/ArmPlatformPkg/ArmPlatformPkg.fdf b/ArmPlatformPkg/ArmPlatformPkg.fdf
index 65f49bfcbea0e668cc8aea8643ca8a9b94772432..36ca8b0850638006ef7028496e5deadf34834a65 100644 (file)
--- a/ArmPlatformPkg/ArmPlatformPkg.fdf
+++ b/ArmPlatformPkg/ArmPlatformPkg.fdf
@@ -133,6 +133,7 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = 8fa66cd0-f773-4f26-8f9f-5e54d0804c68\r
 \r
   INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
 \r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
index 0a22ef6a58774984eff3e1ed1db9c4c2156e053e..bedcf77c537c0d879b55799086e5c7204c98d781 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
@@ -108,6 +108,7 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = 14801114-da6a-4113-985b-dc876337a15e\r
 \r
   INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
 \r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
index a9e9ea8a858ae7dec318d9b288baf49e81642376..c6acf9ef44e3c303457d1adf23d582ac0a983a48 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
@@ -109,6 +109,7 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = 14801114-da6a-4113-985b-dc876337a15e\r
 \r
   INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
 \r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
index 893fb866b7bc5267fb4601f06ad79e3f8e315fdc..3cb634a1ef07e4ea64925f5d8f647d79fea2f951 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
@@ -64,6 +64,7 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = 73dcb643-3862-4904-9076-a94af1890243\r
 \r
   INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
 \r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
index 6ee0b06f41f116e50b6126a1e0c65df61715bca7..c8f425fbf2b9455fc26cff6cc7fc9c5ecea97f56 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
@@ -137,6 +137,7 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = 1a9b3625-5286-4fa6-af5f-8eabc481f3cc\r
 \r
   INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
 \r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
index 19157283a6e6db79928dfa25e3030f64bed88ef9..95d5b1d0c030ec58274219a3bb63938a134b61af 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
@@ -123,6 +123,7 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = 87940482-fc81-41c3-87e6-399cf85ac8a0\r
 \r
   APRIORI DXE {\r
     INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
index 899419673704cffb9ae5ce07f072c62a4f70ddb5..0f20a04b68fd8161ca91a6feeb40d085c6f32890 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
@@ -109,6 +109,7 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = 9ca4f58c-341e-4f42-b37d-6042fcddb5bf\r
 \r
   APRIORI DXE {\r
     INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
index 3d54f9ac65e55cbb735b986029956104c934cec3..507afac45ffc382c851d43183b254fd69ee99e12 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
@@ -109,6 +109,7 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = 12c68be9-0996-49d3-8c5b-4957379027ee\r
 \r
   APRIORI DXE {\r
     INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
index 98000fb74db3f5691a7fe69400ff5d28762f6f1d..d671489a807d41000c5d9316716fed4fd7f11052 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
@@ -109,6 +109,7 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = 272e583c-b951-433f-af42-a9c6862af002\r
 \r
   APRIORI DXE {\r
     INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
index 0c1166d22e51c920eeda42ba932abe32011f5aa3..5015266a2551991085b0080d7b62f966f78b9fda 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
@@ -109,6 +109,7 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = 6685e0b5-d6bb-4c12-97ef-58bd87112dee\r
 \r
   APRIORI DXE {\r
     INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf
index 9fc41428e441bee0592d86f24bed0c2cb1f3876d..ee862d485ef4711e4a9a45618868dbd3e1265046 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf
@@ -111,6 +111,7 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = a2fc72eb-4157-40a3-8110-14c010e810b4\r
 \r
   APRIORI DXE {\r
     INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r

diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf b/BeagleBoardPkg/BeagleBoardPkg.fdf
index a2a5fe725e01bfd376214f8ef077ea332fbcefb3..9bc5b135b60b0d7853647de5fdc64980db40ff79 100644 (file)
--- a/BeagleBoardPkg/BeagleBoardPkg.fdf
+++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
@@ -82,6 +82,7 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = d0dd3e90-343d-4cb3-8f69-772214989282\r
 \r
   INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
 \r