[PATCH edk2-platforms v1 1/1] Platform/Hisilicon: Fix missing dependency on VariableFlashInfoLib

[PATCH edk2-platforms v1 1/1] Platform/Hisilicon: Fix missing dependency on VariableFlashInfoLib

[Sami Mujawar]

From: Guillaume Gardet <Guillaume.Gardet@arm.com>

The Hisilicon/HiKey and Hisilicon/HiKey960 platform firmware builds
break due to a missing dependency on VariableFlashInfoLib.

Therefore, include VariableFlashInfoLib in the [LibraryClasses.common]
section to satisfy the dependency.

Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Wenyi Xie <xiewenyi2@huawei.com>
Cc: Guillaume Gardet <Guillaume.Gardet@arm.com>
Cc: Pierre Gondois <pierre.gondois@arm.com>
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/Hisilicon/HiKey/HiKey.dsc       | 1 +
 Platform/Hisilicon/HiKey960/HiKey960.dsc | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc
index 375b29375d75cec37eb7410a8ea4396b6cdf89a4..c0de67fce8fe3a76cb6eca7f54814d676939f3e9 100644
--- a/Platform/Hisilicon/HiKey/HiKey.dsc
+++ b/Platform/Hisilicon/HiKey/HiKey.dsc
@@ -62,6 +62,7 @@ [LibraryClasses.common]
   AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
   TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+  VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf
 
 [LibraryClasses.common.SEC]
   PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc b/Platform/Hisilicon/HiKey960/HiKey960.dsc
index 1d09e3f5da74824af3b988a55c646c1b127a3a93..b821f0be60e31507bee8d4358e15fc5eedaf133e 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960.dsc
+++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc
@@ -63,6 +63,7 @@ [LibraryClasses.common]
   AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
   TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+  VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf
 
 [LibraryClasses.common.SEC]
   PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

Re: [PATCH edk2-platforms v1 1/1] Platform/Hisilicon: Fix missing dependency on VariableFlashInfoLib

[PierreGondois]

Hi Sami,
I think other platforms have the same library missing:
- Platform/Hisilicon/D03/D03.dsc
- Platform/Hisilicon/D06/D06.dsc
- Platform/Hisilicon/HiKey960/HiKey960.dsc
- Platform/Hisilicon/HiKey/HiKey.dsc

If the library definition is done in Silicon/Hisilicon/Hisilicon.dsc.inc,
I think it solves all the definitions at once,

Regards,
Pierre


On 1/19/23 17:14, Sami Mujawar wrote:
> From: Guillaume Gardet <Guillaume.Gardet@arm.com>
> 
> The Hisilicon/HiKey and Hisilicon/HiKey960 platform firmware builds
> break due to a missing dependency on VariableFlashInfoLib.
> 
> Therefore, include VariableFlashInfoLib in the [LibraryClasses.common]
> section to satisfy the dependency.
> 
> Cc: Leif Lindholm <quic_llindhol@quicinc.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Wenyi Xie <xiewenyi2@huawei.com>
> Cc: Guillaume Gardet <Guillaume.Gardet@arm.com>
> Cc: Pierre Gondois <pierre.gondois@arm.com>
> Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
> ---
>   Platform/Hisilicon/HiKey/HiKey.dsc       | 1 +
>   Platform/Hisilicon/HiKey960/HiKey960.dsc | 1 +
>   2 files changed, 2 insertions(+)
> 
> diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc
> index 375b29375d75cec37eb7410a8ea4396b6cdf89a4..c0de67fce8fe3a76cb6eca7f54814d676939f3e9 100644
> --- a/Platform/Hisilicon/HiKey/HiKey.dsc
> +++ b/Platform/Hisilicon/HiKey/HiKey.dsc
> @@ -62,6 +62,7 @@ [LibraryClasses.common]
>     AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
>     TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
>     VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
> +  VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf
>   
>   [LibraryClasses.common.SEC]
>     PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
> diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc b/Platform/Hisilicon/HiKey960/HiKey960.dsc
> index 1d09e3f5da74824af3b988a55c646c1b127a3a93..b821f0be60e31507bee8d4358e15fc5eedaf133e 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960.dsc
> +++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc
> @@ -63,6 +63,7 @@ [LibraryClasses.common]
>     AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
>     TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
>     VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
> +  VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf
>   
>   [LibraryClasses.common.SEC]
>     PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf

Re: [edk2-devel] [PATCH edk2-platforms v1 1/1] Platform/Hisilicon: Fix missing dependency on VariableFlashInfoLib

[Sami Mujawar]

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

On Mon, Jan 23, 2023 at 12:08 AM, PierreGondois wrote:

> 
> forms have the same library missing:
> - Platform/Hisilicon/D03/D03.dsc
> - Platform/Hisilicon/D06/D06.dsc
> - Platform/Hisilicon/HiKey960/HiKey960.dsc
> - Platform/Hisilicon/HiKey/HiKey.dsc
> 
> If the library definition is done in Silicon/Hisilicon/Hisilicon.dsc.inc,
> I think it solves all the definitions at once,

Makes sense. Please ignore this patch and I will send out another patch to fix this issue in the dsc.inc.

Regards,

Sami Mujawar

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

Re: [edk2-devel] [PATCH edk2-platforms v1 1/1] Platform/Hisilicon: Fix missing dependency on VariableFlashInfoLib

[Sami Mujawar]

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

Had an offline discussion with Pierre. Apparently there are additional issues that need to be fixed.
So, please ignore this patch series and instead use the patch series from Pierre at https://edk2.groups.io/g/devel/message/99012

Regards,

Sami Mujawar

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