Re: [edk2-devel] [PATCH] Basetools: Include PCD declarations from Library Instance

["PierreGondois" <pierre.gondois@arm.com>]

Hello,
FYIW:
Tested-by: Pierre Gondois <pierre.gondois@arm.com>

On 10/12/23 19:11, levi.yun wrote:
> The patch "[PATCH v3 1/2] StandaloneMmPkg: Make StandaloneMmCpu driver
> architecture independent" (https://edk2.groups.io/g/devel/message/109178)
> removed ArmPkg/ArmPkg.dec from the Packages section in the
> INF file: StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> 
> This change was done as part of making the StandaloneMmCpu driver
> architecture independent.
> 
> Although this change is correct, it results in a side effect
> here some platforms that utilise PCDs declared in ArmPkg.dec are
> no longer declared.
> 
> An example of this issue can be seen when building
> edk2-platforms/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
> 
> $ build -a AARCH64 -t GCC -p Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
> build.py...
> /mnt/source/edk2-platforms/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf(23):
>    error F001: PCD (gArmTokenSpaceGuid.PcdFdBaseAddress) used in
>    FDF is not declared in DEC files.
> 
> As seen above, removing ArmPkg.dec from the Packages section in the
> StandAloneMmCpu Driver Inf file triggers build failure.
> Although, ArmPkg.dec is included in other Library Instances,
> the build system does not include the declarations from
> .dec files defined in Library instances.
> 
> The build system only includes the PCD declarations from DEC files
> that are specified in INF files for Modules (components).
> 
> Therefore, extend the build system to include the Packages from
> Library Instances so that the PCD declarations from the respective package
> DEC files are included.
> 
> This patch can be seen on
>      https://github.com/LeviYeoReum/edk2/tree/levi/2848_dec_check_on_library
> 
> Signed-off-by: levi.yun <yeoreum.yun@arm.com>
> ---
>   BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py b/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
> index f86c749c08c3bb2837a88b5872101bc69e8bf7a0..f52ef42045da52c3d4f20277c61542f659eb7874 100644
> --- a/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
> +++ b/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
> @@ -439,6 +439,10 @@ class WorkspaceAutoGen(AutoGen):
>               PkgSet = set()
>               for mb in [self.BuildDatabase[m, Arch, self.BuildTarget, self.ToolChain] for m in Platform.Modules]:
>                   PkgSet.update(mb.Packages)
> +
> +            for lb in [self.BuildDatabase[l, Arch, self.BuildTarget, self.ToolChain] for l in Platform.LibraryInstances]:
> +                PkgSet.update(lb.Packages)
> +
>               for Inf in ModuleList:
>                   ModuleFile = PathClass(NormPath(Inf), GlobalData.gWorkspace, Arch)
>                   if ModuleFile in Platform.Modules:
> @@ -968,4 +972,3 @@ class WorkspaceAutoGen(AutoGen):
>       #
>       def CreateAsBuiltInf(self):
>           return
> -
> --
> Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#109666): https://edk2.groups.io/g/devel/message/109666
Mute This Topic: https://groups.io/mt/101922917/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-