[Linaro-uefi] Platforms/Styx: add FvNameGuid to FvMain FV

Message ID 1468319111-27985-1-git-send-email-ard.biesheuvel@linaro.org
State Accepted
Commit 22284d37ff3f373ec5900f6f1a7f0b5baeb6cad8
Headers show

Commit Message

Ard Biesheuvel July 12, 2016, 10:25 a.m.
This adds name GUIDs to the Styx FDFs so that DevicePath references to
its contents (i.e., for the UiApp and Shell UEFI applications) are
emitted unambiguously rather than as MemoryMapped()/ device path nodes,
whose values may change between boots (e.g., if the amount of memory
changes, or if the firmware image is updated).

Having stable boot entries is preferable, given that the generic BDS code
autogenerates entries for the UI app and the shell, but does not clean up
the stale outdated ones.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf         | 1 +
 Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 1 +
 2 files changed, 2 insertions(+)

Comments

Leif Lindholm July 12, 2016, 3:35 p.m. | #1
On Tue, Jul 12, 2016 at 12:25:11PM +0200, Ard Biesheuvel wrote:
> This adds name GUIDs to the Styx FDFs so that DevicePath references to
> its contents (i.e., for the UiApp and Shell UEFI applications) are
> emitted unambiguously rather than as MemoryMapped()/ device path nodes,
> whose values may change between boots (e.g., if the amount of memory
> changes, or if the firmware image is updated).
> 
> Having stable boot entries is preferable, given that the generic BDS code
> autogenerates entries for the UI app and the shell, but does not clean up
> the stale outdated ones.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

> ---
>  Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf         | 1 +
>  Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf
> index 148c0a694f16..3b2116756439 100644
> --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf
> +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf
> @@ -70,6 +70,7 @@ FV = STYX_EFI
>  ################################################################################
>  
>  [FV.FvMain]
> +FvNameGuid         = 72b41709-8499-4841-a383-f432de6fce2a
>  BlockSize          = 0x40
>  NumBlocks          = 0         # This FV gets compressed so make it just big enough
>  FvAlignment        = 16        # FV alignment and FV attributes setting.
> diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf
> index 04894d5aa2fd..02e92434813c 100644
> --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf
> +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf
> @@ -70,6 +70,7 @@ FV = STYX_EFI
>  ################################################################################
>  
>  [FV.FvMain]
> +FvNameGuid         = 94f067ae-2aa6-4b30-aa07-4e47fe518bb8
>  BlockSize          = 0x40
>  NumBlocks          = 0         # This FV gets compressed so make it just big enough
>  FvAlignment        = 16        # FV alignment and FV attributes setting.
> -- 
> 1.9.1
>

Patch

diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf
index 148c0a694f16..3b2116756439 100644
--- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf
+++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf
@@ -70,6 +70,7 @@  FV = STYX_EFI
 ################################################################################
 
 [FV.FvMain]
+FvNameGuid         = 72b41709-8499-4841-a383-f432de6fce2a
 BlockSize          = 0x40
 NumBlocks          = 0         # This FV gets compressed so make it just big enough
 FvAlignment        = 16        # FV alignment and FV attributes setting.
diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf
index 04894d5aa2fd..02e92434813c 100644
--- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf
+++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf
@@ -70,6 +70,7 @@  FV = STYX_EFI
 ################################################################################
 
 [FV.FvMain]
+FvNameGuid         = 94f067ae-2aa6-4b30-aa07-4e47fe518bb8
 BlockSize          = 0x40
 NumBlocks          = 0         # This FV gets compressed so make it just big enough
 FvAlignment        = 16        # FV alignment and FV attributes setting.