]> git.proxmox.com Git - mirror_edk2.git/commitdiff
ArmPlatformPkg: Fix Ecc error 10016 in LcdPlatformNullLib
authorPierre Gondois <Pierre.Gondois@arm.com>
Fri, 23 Oct 2020 14:18:04 +0000 (15:18 +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\PrePeiCore\PrePeiCoreMPCore.inf
edk2\ArmPlatformPkg\Library\LcdPlatformNullLib\LcdPlatformNullLib.inf

The PrePeiCoreMPCore module has been imported in 2011 and the
LcdPlatformNullLib module has been created in 2017. The
PrePeiCoreMPCore has the precedence.

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
ArmPlatformPkg/Library/LcdPlatformNullLib/LcdPlatformNullLib.inf

index 55857081692d639e9b010dfdd60f9af676494fb6..21bbe0571f69971070075a89228e6af2cd7e011f 100644 (file)
@@ -1,6 +1,7 @@
 #/** @file\r
 #\r
 #  Copyright (c) 2017, Linaro, Ltd. All rights reserved.\r
+#  Copyright (c) 2020, Arm Limited. All rights reserved.<BR>\r
 #\r
 #  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
@@ -9,7 +10,7 @@
 [Defines]\r
   INF_VERSION                    = 0x0001001A\r
   BASE_NAME                      = LcdPlatformNullLib\r
-  FILE_GUID                      = b78d02bb-d0b5-4389-bc7f-b39ee846c784\r
+  FILE_GUID                      = f8bb120b-528f-46e2-92c2-130870af1a20\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   LIBRARY_CLASS                  = LcdPlatformLib\r