On Tue, 5 Mar 2024 at 12:39, Laszlo Ersek <ler...@redhat.com> wrote:
>
> Rely on AutoGen for declaring ProcessLibraryConstructorList().
>
> Build-tested with:
>
>   build -a AARCH64 -b DEBUG \
>     -m ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf \
>     -p ArmPlatformPkg/ArmPlatformPkg.dsc -t GCC5
>
>   build -a AARCH64 -b DEBUG \
>     -m ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf \
>     -p ArmPlatformPkg/ArmPlatformPkg.dsc -t GCC5
>
>   build -a AARCH64 -b DEBUG \
>     -m ArmPlatformPkg/PrePi/PeiMPCore.inf \
>     -p ArmPlatformPkg/ArmPlatformPkg.dsc -t GCC5
>
>   build -a AARCH64 -b DEBUG \
>     -m ArmPlatformPkg/PrePi/PeiUniCore.inf \
>     -p ArmPlatformPkg/ArmPlatformPkg.dsc -t GCC5
>
> Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org>
> Cc: Leif Lindholm <quic_llind...@quicinc.com>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=990
> Signed-off-by: Laszlo Ersek <ler...@redhat.com>
> ---
>  ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf  |  2 +-
>  ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf |  2 +-
>  ArmPlatformPkg/PrePi/PeiMPCore.inf              |  2 +-
>  ArmPlatformPkg/PrePi/PeiUniCore.inf             |  2 +-
>  ArmPlatformPkg/PrePeiCore/PrePeiCore.h          | 10 ----------
>  ArmPlatformPkg/PrePi/PrePi.h                    |  6 ------
>  6 files changed, 4 insertions(+), 20 deletions(-)
>

Reviewed-by: Ard Biesheuvel <a...@kernel.org>

> diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf 
> b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
> index 4a3112b58dcb..c5cad7e37fbd 100644
> --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
> +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
> @@ -8,7 +8,7 @@
>  #**/
>
>  [Defines]
> -  INF_VERSION                    = 0x00010005
> +  INF_VERSION                    = 1.30
>    BASE_NAME                      = ArmPlatformPrePeiCore
>    FILE_GUID                      = b78d02bb-d0b5-4389-bc7f-b39ee846c784
>    MODULE_TYPE                    = SEC
> diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf 
> b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
> index ab5bf1dac2d8..1d50b4d0b5f2 100644
> --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
> +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
> @@ -8,7 +8,7 @@
>  #**/
>
>  [Defines]
> -  INF_VERSION                    = 0x00010005
> +  INF_VERSION                    = 1.30
>    BASE_NAME                      = ArmPlatformPrePeiCore
>    FILE_GUID                      = 469fc080-aec1-11df-927c-0002a5d5c51b
>    MODULE_TYPE                    = SEC
> diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf 
> b/ArmPlatformPkg/PrePi/PeiMPCore.inf
> index a613b24c340e..0b13b723539c 100644
> --- a/ArmPlatformPkg/PrePi/PeiMPCore.inf
> +++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf
> @@ -8,7 +8,7 @@
>  #**/
>
>  [Defines]
> -  INF_VERSION                    = 0x00010005
> +  INF_VERSION                    = 1.30
>    BASE_NAME                      = ArmPlatformPrePiMPCore
>    FILE_GUID                      = d959e387-7b91-452c-90e0-a1dbac90ddb8
>    MODULE_TYPE                    = SEC
> diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf 
> b/ArmPlatformPkg/PrePi/PeiUniCore.inf
> index b62ea3c485bd..2e237172d571 100644
> --- a/ArmPlatformPkg/PrePi/PeiUniCore.inf
> +++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf
> @@ -9,7 +9,7 @@
>  #**/
>
>  [Defines]
> -  INF_VERSION                    = 0x00010005
> +  INF_VERSION                    = 1.30
>    BASE_NAME                      = ArmPlatformPrePiUniCore
>    FILE_GUID                      = 3e401783-cc94-4fcd-97bc-bd35ac369d2f
>    MODULE_TYPE                    = SEC
> diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h 
> b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
> index c1e13e23e11e..fbf6207db816 100644
> --- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
> +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
> @@ -73,14 +73,4 @@ PeiCommonExceptionEntry (
>    IN UINTN   LR
>    );
>
> -/*
> - * Autogenerated function that calls the library constructors for all of the
> - * module's dependent libraries.
> - */
> -VOID
> -EFIAPI
> -ProcessLibraryConstructorList (
> -  VOID
> -  );
> -
>  #endif
> diff --git a/ArmPlatformPkg/PrePi/PrePi.h b/ArmPlatformPkg/PrePi/PrePi.h
> index 6074a22108d2..1d47ba26be3a 100644
> --- a/ArmPlatformPkg/PrePi/PrePi.h
> +++ b/ArmPlatformPkg/PrePi/PrePi.h
> @@ -79,10 +79,4 @@ ArchInitialize (
>    VOID
>    );
>
> -VOID
> -EFIAPI
> -ProcessLibraryConstructorList (
> -  VOID
> -  );
> -
>  #endif /* _PREPI_H_ */
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116389): https://edk2.groups.io/g/devel/message/116389
Mute This Topic: https://groups.io/mt/104742525/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-


Reply via email to