From: Ard Biesheuvel <a...@kernel.org>
There is a pattern that has been copy-pasted a number of times where a
missing references in the INFs [Ppis] section is 'fixed' by creating a
local GUID variable. Fix all of those.
This is just a janitorial patch with no functional changes so fixing all
of these in one go.
Cc: Leif Lindholm <quic_llind...@quicinc.com>
Signed-off-by: Ard Biesheuvel <a...@kernel.org>
---
Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf | 3 +++
Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf | 3 +++
Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.inf | 3 +++
Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf | 3 +++
Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf | 3 +++
Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c | 4
+---
Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c | 4
+---
Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c | 4
+---
Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c | 4
+---
Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.c | 7
+------
10 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
index 18b74bc42ef4..2a6ae8a4bb9f 100644
--- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
+++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
@@ -35,6 +35,9 @@ [Sources.common]
[Sources.AARCH64]
HiKeyHelper.S
+[Ppis]
+ gArmMpCoreInfoPpiGuid
+
[FixedPcd]
gArmTokenSpaceGuid.PcdArmPrimaryCore
gArmTokenSpaceGuid.PcdArmPrimaryCoreMask
diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
index 81167c76f95c..5ccf4a11d5e2 100644
--- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
+++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
@@ -31,6 +31,9 @@ [Sources.common]
HiKey960Helper.S
HiKey960Mem.c
+[Ppis]
+ gArmMpCoreInfoPpiGuid
+
[FixedPcd]
gArmTokenSpaceGuid.PcdArmPrimaryCore
gArmTokenSpaceGuid.PcdArmPrimaryCoreMask
diff --git
a/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.inf
b/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.inf
index a61da278c705..ffeb28d8a901 100644
--- a/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.inf
+++ b/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.inf
@@ -37,6 +37,9 @@ [Packages]
Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec
Silicon/Ampere/AmpereSiliconPkg/AmpereSiliconPkg.dec
+[Ppis]
+ gArmMpCoreInfoPpiGuid
+
[Pcd]
gArmTokenSpaceGuid.PcdMmBufferBase
gArmTokenSpaceGuid.PcdMmBufferSize
diff --git
a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf
b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf
index 83c3f4bf193f..2ab649019aa0 100644
--- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf
+++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf
@@ -39,6 +39,9 @@ [Sources.common]
[Sources.AARCH64]
AArch64/Helper.S
+[Ppis]
+ gArmMpCoreInfoPpiGuid
+
[FixedPcd]
gArmTokenSpaceGuid.PcdSystemMemoryBase
gArmTokenSpaceGuid.PcdSystemMemorySize
diff --git a/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf
b/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf
index 11134b8fc497..c7b3368ac9e1 100644
--- a/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf
+++ b/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf
@@ -35,6 +35,9 @@ [Sources.AARCH64]
[Guids]
+[Ppis]
+ gArmMpCoreInfoPpiGuid
+
[FixedPcd]
gPhytiumPlatformTokenSpaceGuid.PcdSystemIoBase
gPhytiumPlatformTokenSpaceGuid.PcdSystemIoSize
diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
index 801d63398524..057d566bde67 100644
--- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
+++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
@@ -117,14 +117,12 @@ PrePeiCoreGetMpCoreInfo (
return EFI_SUCCESS;
}
-// Needs to be declared in the file. Otherwise gArmMpCoreInfoPpiGuid is
undefined in the contect of PrePeiCore
-EFI_GUID mArmMpCoreInfoPpiGuid = ARM_MP_CORE_INFO_PPI_GUID;
ARM_MP_CORE_INFO_PPI mMpCoreInfoPpi = { PrePeiCoreGetMpCoreInfo };
EFI_PEI_PPI_DESCRIPTOR gPlatformPpiTable[] = {
{
EFI_PEI_PPI_DESCRIPTOR_PPI,
- &mArmMpCoreInfoPpiGuid,
+ &gArmMpCoreInfoPpiGuid,
&mMpCoreInfoPpi
}
};
diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
index 89cca920ad8d..d7f65420a593 100644
--- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
+++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
@@ -115,14 +115,12 @@ PrePeiCoreGetMpCoreInfo (
return EFI_SUCCESS;
}
-// Needs to be declared in the file. Otherwise gArmMpCoreInfoPpiGuid is
undefined in the contect of PrePeiCore
-EFI_GUID mArmMpCoreInfoPpiGuid = ARM_MP_CORE_INFO_PPI_GUID;
ARM_MP_CORE_INFO_PPI mMpCoreInfoPpi = { PrePeiCoreGetMpCoreInfo };
EFI_PEI_PPI_DESCRIPTOR gPlatformPpiTable[] = {
{
EFI_PEI_PPI_DESCRIPTOR_PPI,
- &mArmMpCoreInfoPpiGuid,
+ &gArmMpCoreInfoPpiGuid,
&mMpCoreInfoPpi
}
};
diff --git
a/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c
b/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c
index f2ec923d6f8d..84104213d68b 100644
--- a/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c
+++ b/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c
@@ -125,14 +125,12 @@ PrePeiCoreGetMpCoreInfo (
return EFI_SUCCESS;
}
-// Needs to be declared in the file. Otherwise gArmMpCoreInfoPpiGuid is
undefined in the contect of PrePeiCore
-EFI_GUID mArmMpCoreInfoPpiGuid = ARM_MP_CORE_INFO_PPI_GUID;
ARM_MP_CORE_INFO_PPI mMpCoreInfoPpi = { PrePeiCoreGetMpCoreInfo };
EFI_PEI_PPI_DESCRIPTOR gPlatformPpiTable[] = {
{
EFI_PEI_PPI_DESCRIPTOR_PPI,
- &mArmMpCoreInfoPpiGuid,
+ &gArmMpCoreInfoPpiGuid,
&mMpCoreInfoPpi
},
};
diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
index 0a00cd9d3e3b..070bd0a7f5dc 100644
--- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
+++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
@@ -59,14 +59,12 @@ PrePeiCoreGetMpCoreInfo (
return EFI_UNSUPPORTED;
}
-// Needs to be declared in the file. Otherwise gArmMpCoreInfoPpiGuid is
undefined in the contect of PrePeiCore
-EFI_GUID mArmMpCoreInfoPpiGuid = ARM_MP_CORE_INFO_PPI_GUID;
ARM_MP_CORE_INFO_PPI mMpCoreInfoPpi = { PrePeiCoreGetMpCoreInfo };
EFI_PEI_PPI_DESCRIPTOR gPlatformPpiTable[] = {
{
EFI_PEI_PPI_DESCRIPTOR_PPI,
- &mArmMpCoreInfoPpiGuid,
+ &gArmMpCoreInfoPpiGuid,
&mMpCoreInfoPpi
}
};
diff --git a/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.c
b/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.c
index a192797d1cfa..7338fe53d6c0 100644
--- a/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.c
+++ b/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.c
@@ -100,18 +100,13 @@ PrePeiCoreGetMpCoreInfo (
return EFI_SUCCESS;
}
-//
-// Needs to be declared in the file. Otherwise gArmMpCoreInfoPpiGuid is
-// undefined in the contect of PrePeiCore
-//
-EFI_GUID mArmMpCoreInfoPpiGuid = ARM_MP_CORE_INFO_PPI_GUID;
ARM_MP_CORE_INFO_PPI mMpCoreInfoPpi = { PrePeiCoreGetMpCoreInfo };
EFI_PEI_PPI_DESCRIPTOR gPlatformPpiTable[] =
{
{
EFI_PEI_PPI_DESCRIPTOR_PPI,
- &mArmMpCoreInfoPpiGuid,
+ &gArmMpCoreInfoPpiGuid,
&mMpCoreInfoPpi
}
};
--
2.46.0.rc1.232.g9752f9e123-goog
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120116): https://edk2.groups.io/g/devel/message/120116
Mute This Topic: https://groups.io/mt/107626562/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
