diff options
| author | Pierre Gondois <Pierre.Gondois@arm.com> | 2020-10-23 14:37:14 +0100 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2020-12-09 15:32:12 +0000 |
| commit | 746dda63b2d612a2ad9e0b4c05722920586d2e60 (patch) | |
| tree | ed7a0dfebd6bc9c596fb667e322727fd4edae082 /ArmPlatformPkg | |
| parent | 28978df0bdafce1d26ff337fd67ee6c3a5b3876e (diff) | |
| download | edk2-746dda63b2d612a2ad9e0b4c05722920586d2e60.tar.gz edk2-746dda63b2d612a2ad9e0b4c05722920586d2e60.tar.bz2 edk2-746dda63b2d612a2ad9e0b4c05722920586d2e60.zip | |
ArmPlatformPkg: Fix Ecc error 10016 in PrePi
This patch fixes the following Ecc reported error:
Module file has FILE_GUID collision with other
module file
The two .inf files with clashing GUID are:
edk2\ArmPlatformPkg\PrePi\PeiUniCore.inf
edk2\ArmPlatformPkg\PrePi\PeiMPCore.inf
Both files seem to have been imported from the previous
svn repository as the same time.
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
Diffstat (limited to 'ArmPlatformPkg')
| -rw-r--r-- | ArmPlatformPkg/PrePi/PeiUniCore.inf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf index 78d218ae09..83a3df78ac 100644 --- a/ArmPlatformPkg/PrePi/PeiUniCore.inf +++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf @@ -2,6 +2,7 @@ #
# (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
# Copyright (c) 2011-2017, ARM Ltd. All rights reserved.<BR>
+# Copyright (c) 2020, Arm Limited. All rights reserved.<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -10,7 +11,7 @@ [Defines]
INF_VERSION = 0x00010005
BASE_NAME = ArmPlatformPrePiUniCore
- FILE_GUID = d959e387-7b91-452c-90e0-a1dbac90ddb8
+ FILE_GUID = 3e401783-cc94-4fcd-97bc-bd35ac369d2f
MODULE_TYPE = SEC
VERSION_STRING = 1.0
|