1. Patchew
  2. EDK2
  3. View series

[edk2] [PATCH edk2-platforms] Platform/ARM/Sgi: Fix typo in GUID name

Chandni Cherukuri posted 1 patch 5 years, 10 months ago
Failed in applying to current master (apply log)
Platform/ARM/SgiPkg/AcpiTables/Sgi575/AcpiTables.inf    | 2 +-
Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c   | 2 +-
Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf | 2 +-
Platform/ARM/SgiPkg/SgiPlatform.dec                     | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
[edk2] [PATCH edk2-platforms] Platform/ARM/Sgi: Fix typo in GUID name
Posted by Chandni Cherukuri 5 years, 10 months ago 
Replace all uses of 'gSgi575AcpiTablesiFileGuid' with
'gSgi575AcpiTablesFileGuid' for SGI575 platform.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Chandni Cherukuri <chandni.cherukuri@arm.com>
---
 Platform/ARM/SgiPkg/AcpiTables/Sgi575/AcpiTables.inf    | 2 +-
 Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c   | 2 +-
 Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf | 2 +-
 Platform/ARM/SgiPkg/SgiPlatform.dec                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/AcpiTables.inf
index e9bdd8a..feb1018 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/AcpiTables.inf
@@ -16,7 +16,7 @@
 [Defines]
   INF_VERSION                    = 0x0001001A
   BASE_NAME                      = Sgi575AcpiTables
-  FILE_GUID                      = c712719a-0aaf-438c-9cdd-35ab4d60207d  # gSgi575AcpiTablesiFileGuid
+  FILE_GUID                      = c712719a-0aaf-438c-9cdd-35ab4d60207d  # gSgi575AcpiTablesFileGuid
   MODULE_TYPE                    = USER_DEFINED
   VERSION_STRING                 = 1.0
 
diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
index 83adb63..880f5d5 100644
--- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
+++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
@@ -47,7 +47,7 @@ ArmSgiPkgEntryPoint (
   ConfigId = ((HobData->PlatformId >> SGI_CONFIG_SHIFT) & SGI_CONFIG_MASK);
 
   if ((PartNum == SGI575_PART_NUM) && (ConfigId == SGI575_CONF_NUM)) {
-    Status = LocateAndInstallAcpiFromFv (&gSgi575AcpiTablesiFileGuid);
+    Status = LocateAndInstallAcpiFromFv (&gSgi575AcpiTablesFileGuid);
     if (EFI_ERROR (Status)) {
       DEBUG ((DEBUG_ERROR, "%a: Failed to install ACPI tables\n", __FUNCTION__));
       return Status;
diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
index b6b8209..df546af 100644
--- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
+++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
@@ -36,7 +36,7 @@
 
 [Guids]
   gArmSgiPlatformIdDescriptorGuid
-  gSgi575AcpiTablesiFileGuid
+  gSgi575AcpiTablesFileGuid
 
 [FeaturePcd]
   gArmSgiTokenSpaceGuid.PcdVirtioSupported
diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dec b/Platform/ARM/SgiPkg/SgiPlatform.dec
index ea9f6c5..2f6ebcc 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.dec
+++ b/Platform/ARM/SgiPkg/SgiPlatform.dec
@@ -32,7 +32,7 @@
   # ARM Sgi Platform ID descriptor
   gArmSgiPlatformIdDescriptorGuid = { 0xf56f152a, 0xad2a, 0x11e6, { 0xb1, 0xa7, 0x00, 0x50, 0x56, 0x3c, 0x44, 0xcc } }
   gArmSgiTokenSpaceGuid      = { 0x577d6941, 0xaea1, 0x40b4, { 0x90, 0x93, 0x2a, 0x86, 0x61, 0x72, 0x5a, 0x57 } }
-  gSgi575AcpiTablesiFileGuid = { 0xc712719a, 0x0aaf, 0x438c, { 0x9c, 0xdd, 0x35, 0xab, 0x4d, 0x60, 0x20, 0x7d } }
+  gSgi575AcpiTablesFileGuid  = { 0xc712719a, 0x0aaf, 0x438c, { 0x9c, 0xdd, 0x35, 0xab, 0x4d, 0x60, 0x20, 0x7d } }
 
 [PcdsFeatureFlag.common]
   # Set this PCD to TRUE to enable virtio support.
-- 
2.7.4

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH edk2-platforms] Platform/ARM/Sgi: Fix typo in GUID name
Posted by Ard Biesheuvel 5 years, 10 months ago 
On 18 June 2018 at 12:49, Chandni Cherukuri <chandni.cherukuri@arm.com> wrote:
> Replace all uses of 'gSgi575AcpiTablesiFileGuid' with
> 'gSgi575AcpiTablesFileGuid' for SGI575 platform.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Chandni Cherukuri <chandni.cherukuri@arm.com>

Thanks

Pushed as 9336a9f26cd7702d2ce00095c0bdad3188a397cb

> ---
>  Platform/ARM/SgiPkg/AcpiTables/Sgi575/AcpiTables.inf    | 2 +-
>  Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c   | 2 +-
>  Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf | 2 +-
>  Platform/ARM/SgiPkg/SgiPlatform.dec                     | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/AcpiTables.inf
> index e9bdd8a..feb1018 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/AcpiTables.inf
> +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/AcpiTables.inf
> @@ -16,7 +16,7 @@
>  [Defines]
>    INF_VERSION                    = 0x0001001A
>    BASE_NAME                      = Sgi575AcpiTables
> -  FILE_GUID                      = c712719a-0aaf-438c-9cdd-35ab4d60207d  # gSgi575AcpiTablesiFileGuid
> +  FILE_GUID                      = c712719a-0aaf-438c-9cdd-35ab4d60207d  # gSgi575AcpiTablesFileGuid
>    MODULE_TYPE                    = USER_DEFINED
>    VERSION_STRING                 = 1.0
>
> diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
> index 83adb63..880f5d5 100644
> --- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
> +++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
> @@ -47,7 +47,7 @@ ArmSgiPkgEntryPoint (
>    ConfigId = ((HobData->PlatformId >> SGI_CONFIG_SHIFT) & SGI_CONFIG_MASK);
>
>    if ((PartNum == SGI575_PART_NUM) && (ConfigId == SGI575_CONF_NUM)) {
> -    Status = LocateAndInstallAcpiFromFv (&gSgi575AcpiTablesiFileGuid);
> +    Status = LocateAndInstallAcpiFromFv (&gSgi575AcpiTablesFileGuid);
>      if (EFI_ERROR (Status)) {
>        DEBUG ((DEBUG_ERROR, "%a: Failed to install ACPI tables\n", __FUNCTION__));
>        return Status;
> diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
> index b6b8209..df546af 100644
> --- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
> +++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
> @@ -36,7 +36,7 @@
>
>  [Guids]
>    gArmSgiPlatformIdDescriptorGuid
> -  gSgi575AcpiTablesiFileGuid
> +  gSgi575AcpiTablesFileGuid
>
>  [FeaturePcd]
>    gArmSgiTokenSpaceGuid.PcdVirtioSupported
> diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dec b/Platform/ARM/SgiPkg/SgiPlatform.dec
> index ea9f6c5..2f6ebcc 100644
> --- a/Platform/ARM/SgiPkg/SgiPlatform.dec
> +++ b/Platform/ARM/SgiPkg/SgiPlatform.dec
> @@ -32,7 +32,7 @@
>    # ARM Sgi Platform ID descriptor
>    gArmSgiPlatformIdDescriptorGuid = { 0xf56f152a, 0xad2a, 0x11e6, { 0xb1, 0xa7, 0x00, 0x50, 0x56, 0x3c, 0x44, 0xcc } }
>    gArmSgiTokenSpaceGuid      = { 0x577d6941, 0xaea1, 0x40b4, { 0x90, 0x93, 0x2a, 0x86, 0x61, 0x72, 0x5a, 0x57 } }
> -  gSgi575AcpiTablesiFileGuid = { 0xc712719a, 0x0aaf, 0x438c, { 0x9c, 0xdd, 0x35, 0xab, 0x4d, 0x60, 0x20, 0x7d } }
> +  gSgi575AcpiTablesFileGuid  = { 0xc712719a, 0x0aaf, 0x438c, { 0x9c, 0xdd, 0x35, 0xab, 0x4d, 0x60, 0x20, 0x7d } }
>
>  [PcdsFeatureFlag.common]
>    # Set this PCD to TRUE to enable virtio support.
> --
> 2.7.4
>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-8c64711

© 2016 - 2024 Red Hat, Inc.