diff options
| author | Michael D Kinney <michael.d.kinney@intel.com> | 2019-04-24 14:15:32 -0700 |
|---|---|---|
| committer | Michael D Kinney <michael.d.kinney@intel.com> | 2019-04-30 16:39:41 -0700 |
| commit | 80d28ddeb2ce696e955de4a5f4a2259581d61939 (patch) | |
| tree | 40b9f19b9022d822f7b06975edc778f83b1af247 /QuarkPlatformPkg | |
| parent | 0edaa8c16204ffd018391c584322455c50c2719c (diff) | |
| download | edk2-80d28ddeb2ce696e955de4a5f4a2259581d61939.tar.gz edk2-80d28ddeb2ce696e955de4a5f4a2259581d61939.tar.bz2 edk2-80d28ddeb2ce696e955de4a5f4a2259581d61939.zip | |
QuarkPlatformPkg/PlatformInit: Resolve ResetSystemLib name collision
Change function name from ResetSystem() to PlatformResetSystem()
to resolve name collision with ResetSystemLib.
Cc: Kelly Steele <kelly.steele@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Kelly Steele <kelly.steele@intel.com>
Diffstat (limited to 'QuarkPlatformPkg')
| -rw-r--r-- | QuarkPlatformPkg/Platform/Pei/PlatformInit/MemoryCallback.c | 6 | ||||
| -rw-r--r-- | QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/MemoryCallback.c b/QuarkPlatformPkg/Platform/Pei/PlatformInit/MemoryCallback.c index cc2a6674d0..cfdcba8e02 100644 --- a/QuarkPlatformPkg/Platform/Pei/PlatformInit/MemoryCallback.c +++ b/QuarkPlatformPkg/Platform/Pei/PlatformInit/MemoryCallback.c @@ -7,7 +7,7 @@ following action is performed in this file, 4. Set MTRR for PEI
5. Create FV HOB and Flash HOB
-Copyright (c) 2013 - 2016, Intel Corporation.
+Copyright (c) 2013 - 2019, Intel Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -20,7 +20,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent extern EFI_PEI_PPI_DESCRIPTOR mPpiStall[];
-EFI_PEI_RESET_PPI mResetPpi = { ResetSystem };
+EFI_PEI_RESET_PPI mResetPpi = { PlatformResetSystem };
EFI_PEI_PPI_DESCRIPTOR mPpiList[1] = {
{
@@ -40,7 +40,7 @@ EFI_PEI_PPI_DESCRIPTOR mPpiList[1] = { **/
EFI_STATUS
EFIAPI
-ResetSystem (
+PlatformResetSystem (
IN CONST EFI_PEI_SERVICES **PeiServices
)
{
diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.h b/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.h index 6792538d42..84def44717 100644 --- a/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.h +++ b/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.h @@ -1,7 +1,7 @@ /** @file
The header file of Platform PEIM.
-Copyright (c) 2013 Intel Corporation.
+Copyright (c) 2013 - 2019 Intel Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -59,7 +59,7 @@ UpdateBootMode ( **/
EFI_STATUS
EFIAPI
-ResetSystem (
+PlatformResetSystem (
IN CONST EFI_PEI_SERVICES **PeiServices
);
|