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.web11.185.1637771029385303648 for ; Wed, 24 Nov 2021 08:23:49 -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 CB1B71FB; Wed, 24 Nov 2021 08:23:43 -0800 (PST) Received: from e126645.nice.arm.com (e126645.nice.arm.com [10.34.125.4]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 006473F66F; Wed, 24 Nov 2021 08:23:42 -0800 (PST) From: "PierreGondois" To: devel@edk2.groups.io Cc: Sami Mujawar Subject: [PATCH edk2-platforms v1 04/10] Platform/ARM: Modify duplicated GUID in ArmVExpressPkg.dec Date: Wed, 24 Nov 2021 17:23:24 +0100 Message-Id: <20211124162330.236813-5-Pierre.Gondois@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211124162330.236813-1-Pierre.Gondois@arm.com> References: <20211124162330.236813-1-Pierre.Gondois@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Pierre Gondois The two following packages have the same GUID: - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec - edk2/ArmPlatformPkg/ArmPlatformPkg.dec The gArmVExpressTokenSpaceGuid in Platform/ARM/VExpressPkg/ArmVExpressPkg.dec is also identical. All the GUIDs have been added at the same time, initially in the edk2 repository. Modify the GUIDs in the edk2-platforms repository. Signed-off-by: Pierre Gondois --- Platform/ARM/VExpressPkg/ArmVExpressPkg.dec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec b/Platform/ARM/V= ExpressPkg/ArmVExpressPkg.dec index 848510bff17e..76ba4f7f6485 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec +++ b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec @@ -10,7 +10,7 @@ [Defines] DEC_SPECIFICATION =3D 0x00010005 PACKAGE_NAME =3D ArmVExpressPkg - PACKAGE_GUID =3D 9c0aaed4-74c5-4043-b417-a3223814ce7= 6 + PACKAGE_GUID =3D 9F8DA3A6-3B84-44E4-9E36-E51972F6F68= 8 PACKAGE_VERSION =3D 0.1 ########################################################################= ######## @@ -29,7 +29,7 @@ [LibraryClasses] ArmPlatformSysConfigLib|Include/Library/ArmPlatformSysConfigLib.h [Guids.common] - gArmVExpressTokenSpaceGuid =3D { 0x9c0aaed4, 0x74c5, 0x4043, { 0xb= 4, 0x17, 0xa3, 0x22, 0x38, 0x14, 0xce, 0x76 } } + gArmVExpressTokenSpaceGuid =3D { 0xD8D68B8E, 0x0ACE, 0x4942, { 0xA= 4, 0xB9, 0x36, 0xEE, 0x9E, 0x80, 0x80, 0x9D } } [PcdsFeatureFlag.common] -- 2.25.1