[PATCH edk2-platforms 0/5] Build fixes for Arm/Hisilicon platforms

[PATCH edk2-platforms 0/5] Build fixes for Arm/Hisilicon platforms

[PierreGondois]

From: Pierre Gondois <pierre.gondois@arm.com>

These patches were only compile tested:
- [1/5] Platform/ARM/SgiPkg: Remove '-march=armv8-a+nofp' flag
- [2/5] Platform/StandaloneMm: Remove '-march=armv8-a+nofp' flag
but as described in the commit message of [1/5], I was told the
flag was not necessary anymore.

Building some of the Hilisicon platforms still fails.
Building:
- D03.dsc
- D05.dsc
Command:
  build -a AARCH64 -t GCC5 -p Platform/Hisilicon/D05/D05.dsc
Gives:
  : error FFFD: Cyclic dependency detected while generating rule for
  /home/piegon01/src/uefi/Build/D05/DEBUG_GCC5/AARCH64/Platform/Hisilicon/Drivers/Sm750Dxe/UefiSmi/DEBUG/SmiGraphicsOutput.efi

Building:
- D06.dsc
Gives error due to the fact these 2 files have the same name and the build
system doesn't pick the right one. The file in the ArmPkg is the most
recent:
- edk2/ArmPkg/Include/Library/OemMiscLib.h
- edk2-platfoms/Silicon/Hisilicon/Include/Library/OemMiscLib.h

Pierre Gondois (5):
  Platform/ARM/SgiPkg: Remove '-march=armv8-a+nofp' flag
  Platform/StandaloneMm: Remove '-march=armv8-a+nofp' flag
  Silicon/Hisilicon/FlashFvbDxe: Update TokenSpace of
    PcdNorFlashCheckBlockLocked
  Platform/Hisilicon: Add VariableFlashInfoLib to Hisilicon.dsc.inc
  Platform/ARM/Sgi: Add VariableFlashInfoLib to SgiPlatformMm.dsc.inc

 Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc                      | 3 ++-
 .../PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc       | 2 +-
 Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf          | 3 ++-
 Silicon/Hisilicon/Hisilicon.dsc.inc                            | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

-- 
2.25.1

[PATCH edk2-platforms 1/5] Platform/ARM/SgiPkg: Remove '-march=armv8-a+nofp' flag

[PierreGondois]

From: Pierre Gondois <pierre.gondois@arm.com>

The '-march=armv8-a+nofp' flag abort the following build:
  build -a AARCH64 -p Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
  -t GCC5 -D SECURE_STORAGE_ENABLE
Error message:
  CryptoPkg/Library/OpensslLib/openssl/crypto/rand/drbg_lib.c:1009:12:
  error: ‘+nofp’ feature modifier is incompatible with the use of
  floating-point types
  static int drbg_add(const void *buf, int num, double randomness)
			 ^~~~~~~~

In SgiPlatformMm.dsc.inc, the '-march=armv8-a+nofp' flag was
originally added in:
commit 1974293d1975 ("Platform/ARM/SgiPkg: Build infrastructure for
StandaloneMm image")
as a linker flag. The flag seem to have been added to avoid triggering
an exception due to the floating point unit missing in RTL. With the
latest RTL, the exception is not triggered anymore.

commit 936e8dd57524 ("Platform/Sgi: Cleanup build options for
StandaloneMM context")
moves the flag from the linker to the compiler, making the build fail.

Remove the '-march=armv8-a+nofp' flag as it is not necessary anymore
for SgiPlatformMm.dsc.inc, and is probably not necessary for
PlatformStandaloneMmRpmb.dsc.

CC: Omkar Anand Kulkarni <omkar.kulkarni@arm.com>
CC: Pranav Madhu <pranav.madhu@arm.com>
CC: Sayanta Pattanayak <Sayanta.Pattanayak@arm.com>
Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
index 01f0a7657c51..f9a516b341f0 100644
--- a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
+++ b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
@@ -146,5 +146,5 @@ [Components.AARCH64]
 #
 ###################################################################################################
 [BuildOptions.AARCH64]
-  GCC:*_*_*_CC_FLAGS = -mstrict-align -march=armv8-a+nofp -D DISABLE_NEW_DEPRECATED_INTERFACES
+  GCC:*_*_*_CC_FLAGS = -mstrict-align -D DISABLE_NEW_DEPRECATED_INTERFACES
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
-- 
2.25.1

Re: [PATCH edk2-platforms 1/5] Platform/ARM/SgiPkg: Remove '-march=armv8-a+nofp' flag

[Thomas Abraham]

On 25/01/2023 10:27, Pierre.Gondois@arm.com wrote:
> From: Pierre Gondois <pierre.gondois@arm.com>
> 
> The '-march=armv8-a+nofp' flag abort the following build:
>    build -a AARCH64 -p Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
>    -t GCC5 -D SECURE_STORAGE_ENABLE
> Error message:
>    CryptoPkg/Library/OpensslLib/openssl/crypto/rand/drbg_lib.c:1009:12:
>    error: ‘+nofp’ feature modifier is incompatible with the use of
>    floating-point types
>    static int drbg_add(const void *buf, int num, double randomness)
> 			 ^~~~~~~~
> 
> In SgiPlatformMm.dsc.inc, the '-march=armv8-a+nofp' flag was
> originally added in:
> commit 1974293d1975 ("Platform/ARM/SgiPkg: Build infrastructure for
> StandaloneMm image")
> as a linker flag. The flag seem to have been added to avoid triggering
> an exception due to the floating point unit missing in RTL. With the
> latest RTL, the exception is not triggered anymore.
> 
> commit 936e8dd57524 ("Platform/Sgi: Cleanup build options for
> StandaloneMM context")
> moves the flag from the linker to the compiler, making the build fail.
> 
> Remove the '-march=armv8-a+nofp' flag as it is not necessary anymore
> for SgiPlatformMm.dsc.inc, and is probably not necessary for
> PlatformStandaloneMmRpmb.dsc.
> 
> CC: Omkar Anand Kulkarni <omkar.kulkarni@arm.com>
> CC: Pranav Madhu <pranav.madhu@arm.com>
> CC: Sayanta Pattanayak <Sayanta.Pattanayak@arm.com>
> Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
> ---
>   Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
> index 01f0a7657c51..f9a516b341f0 100644
> --- a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
> +++ b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
> @@ -146,5 +146,5 @@ [Components.AARCH64]
>   #
>   ###################################################################################################
>   [BuildOptions.AARCH64]
> -  GCC:*_*_*_CC_FLAGS = -mstrict-align -march=armv8-a+nofp -D DISABLE_NEW_DEPRECATED_INTERFACES
> +  GCC:*_*_*_CC_FLAGS = -mstrict-align -D DISABLE_NEW_DEPRECATED_INTERFACES
>     GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000

Thanks for this fix.

Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>

Re: [edk2-devel] [PATCH edk2-platforms 1/5] Platform/ARM/SgiPkg: Remove '-march=armv8-a+nofp' flag

[Sami Mujawar]

[-- Attachment #1: Type: text/plain, Size: 121 bytes --]

Hi Pierre,

Thank you for this patch.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

[-- Attachment #2: Type: text/html, Size: 159 bytes --]

[PATCH edk2-platforms 2/5] Platform/StandaloneMm: Remove '-march=armv8-a+nofp' flag

[PierreGondois]

From: Pierre Gondois <pierre.gondois@arm.com>

The '-march=armv8-a+nofp' flag used for PlatformStandaloneMm.dsc
was removed in the previous patch. The same flag was probably copied
from this first configuration in:
commit bd5071cfbde01 ("StMMRpmb: Add support for building StandaloneMm
image for OP-TEE")

As the flag is removed for PlatformStandaloneMm.dsc in the previous
patch, also remove the flag for PlatformStandaloneMmRpmb.dsc.

CC: Ilias Apalodimas <ilias.apalodimas@linaro.org>
CC: Omkar Anand Kulkarni <omkar.kulkarni@arm.com>
CC: Pranav Madhu <pranav.madhu@arm.com>
CC: Sayanta Pattanayak <Sayanta.Pattanayak@arm.com>
Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 .../PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc
index 653029c52fdb..611d76e62117 100644
--- a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc
+++ b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc
@@ -165,7 +165,7 @@ [Components.common]
 #
 ###################################################################################################
 [BuildOptions.AARCH64]
-GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 -march=armv8-a+nofp
+GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
 GCC:*_*_*_CC_FLAGS = -mstrict-align
 
 [BuildOptions.ARM]
-- 
2.25.1

Re: [PATCH edk2-platforms 2/5] Platform/StandaloneMm: Remove '-march=armv8-a+nofp' flag

[Thomas Abraham]

On 25/01/2023 10:27, Pierre.Gondois@arm.com wrote:
> From: Pierre Gondois <pierre.gondois@arm.com>
> 
> The '-march=armv8-a+nofp' flag used for PlatformStandaloneMm.dsc
> was removed in the previous patch. The same flag was probably copied
> from this first configuration in:
> commit bd5071cfbde01 ("StMMRpmb: Add support for building StandaloneMm
> image for OP-TEE")
> 
> As the flag is removed for PlatformStandaloneMm.dsc in the previous
> patch, also remove the flag for PlatformStandaloneMmRpmb.dsc.
> 
> CC: Ilias Apalodimas <ilias.apalodimas@linaro.org>
> CC: Omkar Anand Kulkarni <omkar.kulkarni@arm.com>
> CC: Pranav Madhu <pranav.madhu@arm.com>
> CC: Sayanta Pattanayak <Sayanta.Pattanayak@arm.com>
> Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
> ---
>   .../PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc        | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc
> index 653029c52fdb..611d76e62117 100644
> --- a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc
> +++ b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc
> @@ -165,7 +165,7 @@ [Components.common]
>   #
>   ###################################################################################################
>   [BuildOptions.AARCH64]
> -GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 -march=armv8-a+nofp
> +GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
>   GCC:*_*_*_CC_FLAGS = -mstrict-align
>   
>   [BuildOptions.ARM]


Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>

Re: [PATCH edk2-platforms 2/5] Platform/StandaloneMm: Remove '-march=armv8-a+nofp' flag

[Ilias Apalodimas]

On Thu, 26 Jan 2023 at 11:35, Thomas Abraham <thomas.abraham@arm.com> wrote:
>
>
>
> On 25/01/2023 10:27, Pierre.Gondois@arm.com wrote:
> > From: Pierre Gondois <pierre.gondois@arm.com>
> >
> > The '-march=armv8-a+nofp' flag used for PlatformStandaloneMm.dsc
> > was removed in the previous patch. The same flag was probably copied
> > from this first configuration in:
> > commit bd5071cfbde01 ("StMMRpmb: Add support for building StandaloneMm
> > image for OP-TEE")
> >
> > As the flag is removed for PlatformStandaloneMm.dsc in the previous
> > patch, also remove the flag for PlatformStandaloneMmRpmb.dsc.
> >
> > CC: Ilias Apalodimas <ilias.apalodimas@linaro.org>
> > CC: Omkar Anand Kulkarni <omkar.kulkarni@arm.com>
> > CC: Pranav Madhu <pranav.madhu@arm.com>
> > CC: Sayanta Pattanayak <Sayanta.Pattanayak@arm.com>
> > Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
> > ---
> >   .../PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc        | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc
> > index 653029c52fdb..611d76e62117 100644
> > --- a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc
> > +++ b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc
> > @@ -165,7 +165,7 @@ [Components.common]
> >   #
> >   ###################################################################################################
> >   [BuildOptions.AARCH64]
> > -GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 -march=armv8-a+nofp
> > +GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> >   GCC:*_*_*_CC_FLAGS = -mstrict-align
> >
> >   [BuildOptions.ARM]
>
>
> Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>

Thanks for the fix,

Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

Re: [edk2-devel] [PATCH edk2-platforms 2/5] Platform/StandaloneMm: Remove '-march=armv8-a+nofp' flag

[Sami Mujawar]

[-- Attachment #1: Type: text/plain, Size: 121 bytes --]

Hi Pierre,

Thank you for this patch.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

[-- Attachment #2: Type: text/html, Size: 159 bytes --]

[PATCH edk2-platforms 3/5] Silicon/Hisilicon/FlashFvbDxe: Update TokenSpace of PcdNorFlashCheckBlockLocked

[PierreGondois]

From: Pierre Gondois <pierre.gondois@arm.com>

commit d7b286ae5f53 ("Platform/ARM: clone NorFlashDxe from
ArmPlatformPkg")
recently moved the NorFlashDxe.

Update the TokenSpace of the PcdNorFlashCheckBlockLocked accordingly
and include ARM.dec for the module.

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf
index 1119361e7726..93a8f7edc3dd 100644
--- a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf
+++ b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf
@@ -25,6 +25,7 @@ [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
+  Platform/ARM/ARM.dec
   Silicon/Hisilicon/HisiPkg.dec
 
 [LibraryClasses]
@@ -56,7 +57,7 @@ [Pcd.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
 
-  gArmPlatformTokenSpaceGuid.PcdNorFlashCheckBlockLocked
+  gPlatformArmTokenSpaceGuid.PcdNorFlashCheckBlockLocked
   gHisiTokenSpaceGuid.PcdSFCMEM0BaseAddress
 
 [Depex]
-- 
2.25.1

Re: [edk2-devel] [PATCH edk2-platforms 3/5] Silicon/Hisilicon/FlashFvbDxe: Update TokenSpace of PcdNorFlashCheckBlockLocked

[Sami Mujawar]

[-- Attachment #1: Type: text/plain, Size: 602 bytes --]

Hi Pierre,

Thank you for this patch.

On Wed, Jan 25, 2023 at 02:28 AM, PierreGondois wrote:

> 
> --- a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf
> +++ b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf
> @@ -25,6 +25,7 @@ [Packages]
> MdePkg/MdePkg.dec
> MdeModulePkg/MdeModulePkg.dec
> ArmPlatformPkg/ArmPlatformPkg.dec

[SAMI] I believe the above line can be removed. Can you check, please?
With that addressed.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

> 
> + Platform/ARM/ARM.dec
> Silicon/Hisilicon/HisiPkg.dec
> =20

[-- Attachment #2: Type: text/html, Size: 710 bytes --]

[PATCH edk2-platforms 4/5] Platform/Hisilicon: Add VariableFlashInfoLib to Hisilicon.dsc.inc

[PierreGondois]

From: Pierre Gondois <pierre.gondois@arm.com>

Building the following images with the SECURE_STORAGE_ENABLE flag
fails due to VariableFlashInfoLib being missing:
 - Platform/Hisilicon/D03/D03.dsc
 - Platform/Hisilicon/D06/D06.dsc
 - Platform/Hisilicon/HiKey960/HiKey960.dsc
 - Platform/Hisilicon/HiKey/HiKey.dsc

Add the missing library.

Reported-by: Guillaume Gardet <Guillaume.Gardet@arm.com>
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 Silicon/Hisilicon/Hisilicon.dsc.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc
index b12efd7f031b..1f70460a2baf 100644
--- a/Silicon/Hisilicon/Hisilicon.dsc.inc
+++ b/Silicon/Hisilicon/Hisilicon.dsc.inc
@@ -37,6 +37,7 @@ [LibraryClasses.common]
   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
+  VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf
 
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
   OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
-- 
2.25.1

Re: [edk2-devel] [PATCH edk2-platforms 4/5] Platform/Hisilicon: Add VariableFlashInfoLib to Hisilicon.dsc.inc

[Sami Mujawar]

[-- Attachment #1: Type: text/plain, Size: 732 bytes --]

Hi Pierre,

Thank you for this patch.

On Wed, Jan 25, 2023 at 02:28 AM, PierreGondois wrote:

> 
> - Platform/Hisilicon/D03/D03.dsc
> - Platform/Hisilicon/D06/D06.dsc

There is also Platform/Hisilicon/D05/D05.dsc that probably depends on this fix. However, I find the builds for all the D0x platforms fail. Apparently, the issue is the file Platform/Hisilicon/Drivers/Sm750Dxe/UefiSmi.inf could not be found.
Have you seen this issue or there is something wrong in my setup?

Other than that I could test this patch indeed fixes the build issue for HiKey960 and HiKey platform.
Since this fix is required for the D0x platforms as well.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

[-- Attachment #2: Type: text/html, Size: 818 bytes --]

Re: [edk2-devel] [PATCH edk2-platforms 4/5] Platform/Hisilicon: Add VariableFlashInfoLib to Hisilicon.dsc.inc

[Sami Mujawar]

[-- Attachment #1: Type: text/plain, Size: 250 bytes --]

I see the note in the cover letter. I am getting the same issue.
Looks like there is more work needed to fix the D0x platforms.
I think this patch should progress regardless, but that is a decision for the maintainers.

Regards,

Sami Mujawar

[-- Attachment #2: Type: text/html, Size: 276 bytes --]

[PATCH edk2-platforms 5/5] Platform/ARM/Sgi: Add VariableFlashInfoLib to SgiPlatformMm.dsc.inc

[PierreGondois]

From: Pierre Gondois <pierre.gondois@arm.com>

Building the following images with the SECURE_STORAGE_ENABLE flag
fails due to VariableFlashInfoLib being missing:
 - Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
 - Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc

Add the missing library.

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
index f9a516b341f0..343794c59143 100644
--- a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
+++ b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
@@ -72,6 +72,7 @@ [LibraryClasses.common.MM_STANDALONE]
   TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
+  VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf
 !endif
 
 ################################################################################
-- 
2.25.1

Re: [PATCH edk2-platforms 5/5] Platform/ARM/Sgi: Add VariableFlashInfoLib to SgiPlatformMm.dsc.inc

[Thomas Abraham]

On 25/01/2023 10:28, Pierre.Gondois@arm.com wrote:
> From: Pierre Gondois <pierre.gondois@arm.com>
> 
> Building the following images with the SECURE_STORAGE_ENABLE flag
> fails due to VariableFlashInfoLib being missing:
>   - Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
>   - Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc
> 
> Add the missing library.
> 
> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> ---
>   Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
> index f9a516b341f0..343794c59143 100644
> --- a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
> +++ b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
> @@ -72,6 +72,7 @@ [LibraryClasses.common.MM_STANDALONE]
>     TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
>     VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
>     SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
> +  VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf
>   !endif
>   
>   ################################################################################

Thanks for this fix.

Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>

Re: [edk2-devel] [PATCH edk2-platforms 5/5] Platform/ARM/Sgi: Add VariableFlashInfoLib to SgiPlatformMm.dsc.inc

[Sami Mujawar]

[-- Attachment #1: Type: text/plain, Size: 121 bytes --]

Hi Pierre,

Thank you for this patch.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

[-- Attachment #2: Type: text/html, Size: 159 bytes --]