From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.890.1607019612254064799 for ; Thu, 03 Dec 2020 10:20:12 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: pierre.gondois@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E714411FB; Thu, 3 Dec 2020 10:20:11 -0800 (PST) Received: from e120189.home (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9A4B43F575; Thu, 3 Dec 2020 10:20:10 -0800 (PST) From: "PierreGondois" To: leif@nuviainc.com, ard.biesheuvel@arm.com, thomas.abraham@arm.com, devel@edk2.groups.io Cc: sami.mujawar@arm.com Subject: [PATCH v1 08/16] ArmPlatformPkg: Fix Ecc error 10016 in PrePi Date: Thu, 3 Dec 2020 18:19:37 +0000 Message-Id: <20201203181945.10880-9-Pierre.Gondois@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201203181945.10880-1-Pierre.Gondois@arm.com> References: <20201203181945.10880-1-Pierre.Gondois@arm.com> From: Pierre Gondois 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 --- The changes can be seen at: https://github.com/PierreARM/edk2-platforms/tree/1537_Ecc_ArmPlatformPkg_v1 ArmPlatformPkg/PrePi/PeiUniCore.inf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf index 78d218ae09ca86aa2d77759174118146b97b4576..83a3df78ac26a11366a7bd69d9b29c751d9c01fc 100644 --- a/ArmPlatformPkg/PrePi/PeiUniCore.inf +++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf @@ -2,6 +2,7 @@ # # (C) Copyright 2015 Hewlett-Packard Development Company, L.P.
# Copyright (c) 2011-2017, ARM Ltd. All rights reserved.
+# Copyright (c) 2020, Arm Limited. All rights reserved.
# # 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 -- 2.17.1