public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "PierreGondois" <pierre.gondois@arm.com>
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	[thread overview]
Message-ID: <20201203181945.10880-9-Pierre.Gondois@arm.com> (raw)
In-Reply-To: <20201203181945.10880-1-Pierre.Gondois@arm.com>

From: Pierre Gondois <Pierre.Gondois@arm.com>

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>
---
 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.<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

--
2.17.1


  parent reply	other threads:[~2020-12-03 18:20 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-03 18:19 [PATCH v1 00/16] Fix Ecc reported errors in ArmPlatformPkg PierreGondois
2020-12-03 18:19 ` [PATCH v1 01/16] ArmPlatformPkg: Fix Ecc error 3001 in NorFlashDxe PierreGondois
2020-12-03 18:19 ` [PATCH v1 02/16] ArmPlatformPkg: Fix Ecc error 3002 in PL011UartLib PierreGondois
2020-12-03 18:19 ` [PATCH v1 03/16] ArmPlatformPkg: Fix Ecc error 3002 in PL061GpioDxe PierreGondois
2020-12-03 18:19 ` [PATCH v1 04/16] ArmPlatformPkg: Fix Ecc error 5007 in LcdGraphicsOutputDxe PierreGondois
2020-12-03 18:19 ` [PATCH v1 05/16] ArmPlatformPkg: Fix Ecc error 5007 in NorFlashDxe PierreGondois
2020-12-03 18:19 ` [PATCH v1 06/16] ArmPlatformPkg: Fix Ecc error 5007 in PL061GpioDxe PierreGondois
2020-12-03 18:19 ` [PATCH v1 07/16] ArmPlatformPkg: Fix Ecc error 5007 in PL031RealTimeClockLib PierreGondois
2020-12-03 18:19 ` PierreGondois [this message]
2020-12-03 18:19 ` [PATCH v1 09/16] ArmPlatformPkg: Fix Ecc error 10016 in LcdPlatformNullLib PierreGondois
2020-12-03 18:19 ` [PATCH v1 10/16] ArmPlatformPkg: Fix Ecc error 10014 in LcdGraphicsOutputDxe PierreGondois
2020-12-03 18:19 ` [PATCH v1 11/16] ArmPlatformPkg: Fix Ecc error 10014 in PL061GpioDxe PierreGondois
2020-12-03 18:19 ` [PATCH v1 12/16] ArmPlatformPkg: Fix Ecc error 10014 in SP805WatchdogDxe PierreGondois
2020-12-03 18:19 ` [PATCH v1 13/16] ArmPlatformPkg: Fix Ecc error 10006 in ArmPlatformPkg.dsc PierreGondois
2020-12-03 18:19 ` [PATCH v1 14/16] ArmPlatformPkg: Fix Ecc error 8001 in PrePi PierreGondois
2020-12-03 18:19 ` [PATCH v1 15/16] ArmPlatformPkg: Fix Ecc error 8005 PierreGondois
2020-12-09 15:09   ` Ard Biesheuvel
2020-12-03 18:19 ` [PATCH v1 16/16] ArmPlatformPkg: Fix cspell reported spelling/wording PierreGondois
2020-12-09 15:33 ` [PATCH v1 00/16] Fix Ecc reported errors in ArmPlatformPkg Ard Biesheuvel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201203181945.10880-9-Pierre.Gondois@arm.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox