ArmVirtPkg: add name GUIDs to FvMain instances

Assign name GUIDs to the FVs that may appear in DevicePath references to
things like the UiApp and the UEFI Shell. This prevents these device
paths from changing inadvertently when the FV ends up in a different
memory location due to external occurrences such as, e.g., a change in
the amount of system memory.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index 7bed6785d09901ddeb093ab8d1bbaaac82ab5cf9..ad7037fe5f6399be74e10fca106d3ee19e071ba6 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -24,6 +24,7 @@
 ################################################################################\r
 \r
 [FV.FvMain]\r
+FvNameGuid         = 64074afe-340a-4be6-94ba-91b5b4d0f71e\r
 BlockSize          = 0x40\r
 NumBlocks          = 0         # This FV gets compressed so make it just big enough\r
 FvAlignment        = 16        # FV alignment and FV attributes setting.\r

diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
index 653aa30b4d33a65fedf72cb8870271b82dd03b07..0a97bd8e07c60ceec7d796034346fad297b11ac2 100644 (file)
--- a/ArmVirtPkg/ArmVirtXen.fdf
+++ b/ArmVirtPkg/ArmVirtXen.fdf
@@ -104,6 +104,7 @@ FV = FVMAIN_COMPACT
 ################################################################################\r
 \r
 [FV.FvMain]\r
+FvNameGuid         = 4d2d8743-6337-4c3f-a1d9-7cc7efd283db\r
 BlockSize          = 0x40\r
 NumBlocks          = 0         # This FV gets compressed so make it just big enough\r
 FvAlignment        = 16        # FV alignment and FV attributes setting.\r