]> git.proxmox.com Git - mirror_edk2.git/commitdiff
ArmPlatformPkg: Fix Ecc error 10016 in PrePi
authorPierre Gondois <Pierre.Gondois@arm.com>
Fri, 23 Oct 2020 13:37:14 +0000 (14:37 +0100)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Wed, 9 Dec 2020 15:32:12 +0000 (15:32 +0000)
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>
ArmPlatformPkg/PrePi/PeiUniCore.inf

index 78d218ae09ca86aa2d77759174118146b97b4576..83a3df78ac26a11366a7bd69d9b29c751d9c01fc 100644 (file)
@@ -2,6 +2,7 @@
 #\r
 #  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
 #  Copyright (c) 2011-2017, ARM Ltd. All rights reserved.<BR>\r
+#  Copyright (c) 2020, Arm Limited. All rights reserved.<BR>\r
 #\r
 #  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
@@ -10,7 +11,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = ArmPlatformPrePiUniCore\r
-  FILE_GUID                      = d959e387-7b91-452c-90e0-a1dbac90ddb8\r
+  FILE_GUID                      = 3e401783-cc94-4fcd-97bc-bd35ac369d2f\r
   MODULE_TYPE                    = SEC\r
   VERSION_STRING                 = 1.0\r
 \r