From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id E32CE78042C for ; Tue, 9 Jan 2024 16:30:16 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=wcmxVOVp0Z2Lw8aLMm+24rxNEhD9T3fOMvluLoJXQCw=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1704817815; v=1; b=Fe3XCSoFCjgAN+OimDQD+LI03o/p01lv95AIa4aUBXXbmWXOfXzUuCmJM3wYxjNCDb0B7LmB PrL6C8l6lRe7q/9Vjyahv57evLjS5NPCcwup3Di7JwRadisSGqXDxGhqdT59exnE8IEbnFMimoj iXrYVdhz0j2rTvjWJ7dQ+kgo= X-Received: by 127.0.0.2 with SMTP id j1zsYY7687511xfHRvmBVArV; Tue, 09 Jan 2024 08:30:15 -0800 X-Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web10.21253.1704817815072912877 for ; Tue, 09 Jan 2024 08:30:15 -0800 X-Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1d3ec3db764so10781215ad.2 for ; Tue, 09 Jan 2024 08:30:15 -0800 (PST) X-Gm-Message-State: 3tLHAkdopgc7hDYy3Z1H1oMwx7686176AA= X-Google-Smtp-Source: AGHT+IEKH/v9tI0qTC72qMlPNyVzCUXXN1dX8q7Ul2g6qhlXaSWuv9+SViNMLQwqYIAzLRy2Fvh20A== X-Received: by 2002:a17:902:6e17:b0:1d4:cf2b:2bf with SMTP id u23-20020a1709026e1700b001d4cf2b02bfmr2616058plk.4.1704817813616; Tue, 09 Jan 2024 08:30:13 -0800 (PST) X-Received: from localhost.localdomain ([106.51.188.200]) by smtp.gmail.com with ESMTPSA id c12-20020a170902b68c00b001d457090851sm1983596pls.289.2024.01.09.08.30.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 08:30:13 -0800 (PST) From: "Sunil V L" To: devel@edk2.groups.io Cc: Sunil V L , Ard Biesheuvel , Leif Lindholm , Pierre Gondois , Sami Mujawar Subject: [edk2-devel] [RFC PATCH v1 06/20] DynamicTablesPkg: Rename EObjNameSpaceArm to EObjNameSpaceArch Date: Tue, 9 Jan 2024 21:59:30 +0530 Message-Id: <20240109162944.528006-7-sunilvl@ventanamicro.com> In-Reply-To: <20240109162944.528006-1-sunilvl@ventanamicro.com> References: <20240109162944.528006-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,sunilvl@ventanamicro.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=Fe3XCSoF; dmarc=none; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io To support other architectures, it is better to use an architecture neutral name instead of EObjNameSpaceArm. Rename it as EObjNameSpaceArch and update its consumers. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Pierre Gondois Cc: Sami Mujawar Signed-off-by: Sunil V L --- .../Include/ConfigurationManagerObject.h | 4 ++-- .../KvmtoolCfgMgrDxe/ConfigurationManager.c | 2 +- .../Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c | 8 +++---- .../Acpi/Arm/AcpiIortLibArm/IortGenerator.c | 22 +++++++++---------- .../Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c | 10 ++++----- .../SsdtCmn600Generator.c | 2 +- .../Acpi/Common/AcpiDbg2Lib/Dbg2Generator.c | 2 +- .../Acpi/Common/AcpiFadtLib/FadtGenerator.c | 8 +++---- .../Acpi/Common/AcpiMcfgLib/McfgGenerator.c | 2 +- .../Acpi/Common/AcpiPcctLib/PcctGenerator.c | 12 +++++----- .../Acpi/Common/AcpiPpttLib/PpttGenerator.c | 8 +++---- .../Acpi/Common/AcpiSpcrLib/SpcrGenerator.c | 2 +- .../Acpi/Common/AcpiSratLib/SratGenerator.c | 12 +++++----- .../SsdtCpuTopologyGenerator.c | 12 +++++----- .../AcpiSsdtPcieLib/SsdtPcieGenerator.c | 8 +++---- .../SsdtSerialPortGenerator.c | 2 +- .../DynamicPlatRepoLib/CmObjectTokenFixer.c | 2 +- .../DynamicPlatRepoLib/DynamicPlatRepo.c | 2 +- .../Common/DynamicPlatRepoLib/TokenMapper.c | 2 +- .../ConfigurationManagerObjectParser.c | 2 +- 20 files changed, 62 insertions(+), 62 deletions(-) diff --git a/DynamicTablesPkg/Include/ConfigurationManagerObject.h b/DynamicTablesPkg/Include/ConfigurationManagerObject.h index e7f888f12eee..b0254b3ad4e5 100644 --- a/DynamicTablesPkg/Include/ConfigurationManagerObject.h +++ b/DynamicTablesPkg/Include/ConfigurationManagerObject.h @@ -106,7 +106,7 @@ typedef UINT32 CM_OBJECT_ID; */ typedef enum ObjectNameSpaceID { EObjNameSpaceStandard, ///< Standard Objects Namespace - EObjNameSpaceArm, ///< ARM Objects Namespace + EObjNameSpaceArch, ///< ARCH Objects Namespace EObjNameSpaceOem = 0x8, ///< OEM Objects Namespace EObjNameSpaceMax } EOBJECT_NAMESPACE_ID; @@ -180,7 +180,7 @@ typedef struct CmObjDescriptor { @retval Returns an ARM Configuration Manager Object ID. **/ #define CREATE_CM_ARCH_OBJECT_ID(ObjectId) \ - (CREATE_CM_OBJECT_ID (EObjNameSpaceArm, ObjectId)) + (CREATE_CM_OBJECT_ID (EObjNameSpaceArch, ObjectId)) /** This macro returns a Configuration Manager Object ID in the OEM Object Namespace. diff --git a/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.c b/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.c index 342d068f94fc..ede776fe9a46 100644 --- a/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.c +++ b/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.c @@ -929,7 +929,7 @@ ArmKvmtoolPlatformGetObject ( case EObjNameSpaceStandard: Status = GetStandardNameSpaceObject (This, CmObjectId, Token, CmObject); break; - case EObjNameSpaceArm: + case EObjNameSpaceArch: Status = GetArmNameSpaceObject (This, CmObjectId, Token, CmObject); break; case EObjNameSpaceOem: diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c index a9b9d30d9f73..77c913190f78 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c @@ -36,7 +36,7 @@ Timer Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjGenericTimerInfo, CM_ARCH_GENERIC_TIMER_INFO ); @@ -45,7 +45,7 @@ GET_OBJECT_LIST ( Watchdog Timer Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjPlatformGenericWatchdogInfo, CM_ARCH_GENERIC_WATCHDOG_INFO ); @@ -54,7 +54,7 @@ GET_OBJECT_LIST ( Timer Block Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjPlatformGTBlockInfo, CM_ARCH_GTBLOCK_INFO ); @@ -63,7 +63,7 @@ GET_OBJECT_LIST ( Timer Block Timer Frame Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjGTBlockTimerFrameInfo, CM_ARCH_GTBLOCK_TIMER_FRAME_INFO ); diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c index 3075b6a137b3..c0c68fcc26da 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c @@ -48,7 +48,7 @@ Group node information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjItsGroup, CM_ARCH_ITS_GROUP_NODE ); @@ -57,7 +57,7 @@ GET_OBJECT_LIST ( Named Component node information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjNamedComponent, CM_ARCH_NAMED_COMPONENT_NODE ); @@ -66,7 +66,7 @@ GET_OBJECT_LIST ( Root Complex node information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjRootComplex, CM_ARCH_ROOT_COMPLEX_NODE ); @@ -75,7 +75,7 @@ GET_OBJECT_LIST ( SMMU v1/v2 node information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjSmmuV1SmmuV2, CM_ARCH_SMMUV1_SMMUV2_NODE ); @@ -84,7 +84,7 @@ GET_OBJECT_LIST ( SMMU v3 node information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjSmmuV3, CM_ARCH_SMMUV3_NODE ); @@ -93,7 +93,7 @@ GET_OBJECT_LIST ( PMCG node information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjPmcg, CM_ARCH_PMCG_NODE ); @@ -102,7 +102,7 @@ GET_OBJECT_LIST ( RMR node information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjRmr, CM_ARCH_RMR_NODE ); @@ -111,7 +111,7 @@ GET_OBJECT_LIST ( Memory Range Descriptor Array information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjMemoryRangeDescriptor, CM_ARCH_MEMORY_RANGE_DESCRIPTOR ); @@ -120,7 +120,7 @@ GET_OBJECT_LIST ( ITS Identifier Array information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjGicItsIdentifierArray, CM_ARCH_ITS_IDENTIFIER ); @@ -129,7 +129,7 @@ GET_OBJECT_LIST ( Id Mapping Array information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjIdMappingArray, CM_ARCH_ID_MAPPING ); @@ -138,7 +138,7 @@ GET_OBJECT_LIST ( SMMU Interrupt Array information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjSmmuInterruptArray, CM_ARCH_SMMU_INTERRUPT ); diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c index 8b629e186d80..828216b35942 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c @@ -37,7 +37,7 @@ CPU interface Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjGicCInfo, CM_ARCH_GICC_INFO ); @@ -47,7 +47,7 @@ GET_OBJECT_LIST ( */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjGicDInfo, CM_ARCH_GICD_INFO ); @@ -56,7 +56,7 @@ GET_OBJECT_LIST ( MSI Frame Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjGicMsiFrameInfo, CM_ARCH_GIC_MSI_FRAME_INFO ); @@ -66,7 +66,7 @@ GET_OBJECT_LIST ( */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjGicRedistributorInfo, CM_ARCH_GIC_REDIST_INFO ); @@ -76,7 +76,7 @@ GET_OBJECT_LIST ( Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjGicItsInfo, CM_ARCH_GIC_ITS_INFO ); diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Generator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Generator.c index a717ef00f5d9..1c94c313bed0 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Generator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Generator.c @@ -44,7 +44,7 @@ extern CHAR8 ssdtcmn600template_aml_code[]; Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjCmn600Info, CM_ARCH_CMN_600_INFO ); diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/Dbg2Generator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/Dbg2Generator.c index 1cd92718a9bd..cc656c22f237 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/Dbg2Generator.c +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/Dbg2Generator.c @@ -181,7 +181,7 @@ DBG2_TABLE AcpiDbg2 = { debug port information from the Configuration Manager */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjSerialDebugPortInfo, CM_ARCH_SERIAL_PORT_INFO ); diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/FadtGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/FadtGenerator.c index 0c5024f73a74..6f760532314e 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/FadtGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/FadtGenerator.c @@ -202,7 +202,7 @@ EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE AcpiFadt = { Management Profile Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjPowerManagementProfileInfo, CM_ARCH_POWER_MANAGEMENT_PROFILE_INFO ); @@ -211,7 +211,7 @@ GET_OBJECT_LIST ( Architecture Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjBootArchInfo, CM_ARCH_BOOT_ARCH_INFO ); @@ -220,7 +220,7 @@ GET_OBJECT_LIST ( Vendor ID from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjHypervisorVendorIdentity, CM_ARCH_HYPERVISOR_VENDOR_ID ); @@ -229,7 +229,7 @@ GET_OBJECT_LIST ( feature flags for the platform from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjFixedFeatureFlags, CM_ARCH_FIXED_FEATURE_FLAGS ); diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/McfgGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/McfgGenerator.c index 0d756788e885..dd987741b0e8 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/McfgGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/McfgGenerator.c @@ -51,7 +51,7 @@ typedef /** Retrieve the PCI Configuration Space Information. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjPciConfigSpaceInfo, CM_ARCH_PCI_CONFIG_SPACE_INFO ); diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/PcctGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/PcctGenerator.c index 8e26780a9ce3..eceb994422db 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/PcctGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/PcctGenerator.c @@ -41,7 +41,7 @@ Subspace of Type 0 Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjPccSubspaceType0Info, CM_ARCH_PCC_SUBSPACE_TYPE0_INFO ); @@ -50,7 +50,7 @@ GET_OBJECT_LIST ( Subspace of Type 1 Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjPccSubspaceType1Info, CM_ARCH_PCC_SUBSPACE_TYPE1_INFO ); @@ -59,7 +59,7 @@ GET_OBJECT_LIST ( Subspace of Type 2 Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjPccSubspaceType2Info, CM_ARCH_PCC_SUBSPACE_TYPE2_INFO ); @@ -68,7 +68,7 @@ GET_OBJECT_LIST ( Subspace of Type 3 Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjPccSubspaceType3Info, CM_ARCH_PCC_SUBSPACE_TYPE3_INFO ); @@ -77,7 +77,7 @@ GET_OBJECT_LIST ( Subspace of Type 4 Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjPccSubspaceType4Info, CM_ARCH_PCC_SUBSPACE_TYPE4_INFO ); @@ -86,7 +86,7 @@ GET_OBJECT_LIST ( Subspace of Type 5 Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjPccSubspaceType5Info, CM_ARCH_PCC_SUBSPACE_TYPE5_INFO ); diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/PpttGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/PpttGenerator.c index 36bac2a3a1a4..243ceadf0588 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/PpttGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/PpttGenerator.c @@ -43,7 +43,7 @@ information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjProcHierarchyInfo, CM_ARCH_PROC_HIERARCHY_INFO ); @@ -53,7 +53,7 @@ GET_OBJECT_LIST ( from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjCacheInfo, CM_ARCH_CACHE_INFO ); @@ -63,7 +63,7 @@ GET_OBJECT_LIST ( reference information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjCmRef, CM_ARCH_OBJ_REF ); @@ -73,7 +73,7 @@ GET_OBJECT_LIST ( information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjGicCInfo, CM_ARCH_GICC_INFO ); diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/SpcrGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/SpcrGenerator.c index d03c994e538d..8f71c08ef9a2 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/SpcrGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/SpcrGenerator.c @@ -98,7 +98,7 @@ EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE AcpiSpcr = { Port Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjSerialConsolePortInfo, CM_ARCH_SERIAL_PORT_INFO ) diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/SratGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/SratGenerator.c index c08cd8be2f67..dced328bd3b9 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/SratGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/SratGenerator.c @@ -42,7 +42,7 @@ CPU interface Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjGicCInfo, CM_ARCH_GICC_INFO ); @@ -52,7 +52,7 @@ GET_OBJECT_LIST ( Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjGicItsInfo, CM_ARCH_GIC_ITS_INFO ); @@ -62,7 +62,7 @@ GET_OBJECT_LIST ( information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjMemoryAffinityInfo, CM_ARCH_MEMORY_AFFINITY_INFO ); @@ -72,7 +72,7 @@ GET_OBJECT_LIST ( information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjGenericInitiatorAffinityInfo, CM_ARCH_GENERIC_INITIATOR_AFFINITY_INFO ); @@ -82,7 +82,7 @@ GET_OBJECT_LIST ( information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjDeviceHandleAcpi, CM_ARCH_DEVICE_HANDLE_ACPI ); @@ -92,7 +92,7 @@ GET_OBJECT_LIST ( information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjDeviceHandlePci, CM_ARCH_DEVICE_HANDLE_PCI ); diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyGenerator.c index f7dc5ab0bff1..f0fb209fdc4c 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyGenerator.c @@ -48,7 +48,7 @@ CPU interface Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjGicCInfo, CM_ARCH_GICC_INFO ); @@ -58,7 +58,7 @@ GET_OBJECT_LIST ( information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjProcHierarchyInfo, CM_ARCH_PROC_HIERARCHY_INFO ); @@ -68,7 +68,7 @@ GET_OBJECT_LIST ( reference information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjCmRef, CM_ARCH_OBJ_REF ); @@ -78,7 +78,7 @@ GET_OBJECT_LIST ( information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjLpiInfo, CM_ARCH_LPI_INFO ); @@ -88,7 +88,7 @@ GET_OBJECT_LIST ( information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjCpcInfo, CM_ARCH_CPC_INFO ); @@ -98,7 +98,7 @@ GET_OBJECT_LIST ( information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjEtInfo, CM_ARCH_ET_INFO ); diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieGenerator.c index 9f9e532843ae..dfd868b41d9c 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieGenerator.c @@ -52,7 +52,7 @@ reference information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjCmRef, CM_ARCH_OBJ_REF ); @@ -61,7 +61,7 @@ GET_OBJECT_LIST ( Configuration Space Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjPciConfigSpaceInfo, CM_ARCH_PCI_CONFIG_SPACE_INFO ); @@ -70,7 +70,7 @@ GET_OBJECT_LIST ( Address Mapping Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjPciAddressMapInfo, CM_ARCH_PCI_ADDRESS_MAP_INFO ); @@ -79,7 +79,7 @@ GET_OBJECT_LIST ( Interrupt Mapping Information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjPciInterruptMapInfo, CM_ARCH_PCI_INTERRUPT_MAP_INFO ); diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPortLib/SsdtSerialPortGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPortLib/SsdtSerialPortGenerator.c index 9fad644b18d7..c775870826d9 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPortLib/SsdtSerialPortGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPortLib/SsdtSerialPortGenerator.c @@ -36,7 +36,7 @@ information from the Configuration Manager. */ GET_OBJECT_LIST ( - EObjNameSpaceArm, + EObjNameSpaceArch, EArchObjSerialPortInfo, CM_ARCH_SERIAL_PORT_INFO ); diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c index 06c3f259a5cb..cad3d9e305f1 100644 --- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c +++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c @@ -211,7 +211,7 @@ FixupCmObjectSelfToken ( // Only support Arm objects for now. if ((CmObjDesc == NULL) || - (GET_CM_NAMESPACE_ID (CmObjDesc->ObjectId) != EObjNameSpaceArm)) + (GET_CM_NAMESPACE_ID (CmObjDesc->ObjectId) != EObjNameSpaceArch)) { ASSERT (0); return EFI_INVALID_PARAMETER; diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/DynamicPlatRepo.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/DynamicPlatRepo.c index e095e358dc82..258e8d52f6b4 100644 --- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/DynamicPlatRepo.c +++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/DynamicPlatRepo.c @@ -149,7 +149,7 @@ DynPlatRepoAddObject ( (CmObjDesc->Count == 0) || (ArmNamespaceObjId >= EArchObjMax) || ((CmObjDesc->Count > 1) && (ArmNamespaceObjId != EArchObjCmRef)) || - (GET_CM_NAMESPACE_ID (CmObjDesc->ObjectId) != EObjNameSpaceArm)) + (GET_CM_NAMESPACE_ID (CmObjDesc->ObjectId) != EObjNameSpaceArch)) { ASSERT (0); return EFI_INVALID_PARAMETER; diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/TokenMapper.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/TokenMapper.c index 96de48263ae5..c9ef2a7416ba 100644 --- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/TokenMapper.c +++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/TokenMapper.c @@ -67,7 +67,7 @@ TokenMapperAddObject ( CmObjDesc->Data = Data; // Only EArchObjCmRef CmObj can be added as arrays (more than 1 elements). - if ((GET_CM_NAMESPACE_ID (ObjectId) == EObjNameSpaceArm) && + if ((GET_CM_NAMESPACE_ID (ObjectId) == EObjNameSpaceArch) && (GET_CM_OBJECT_ID (ObjectId) == EArchObjCmRef)) { CmObjDesc->Count = Size / sizeof (CM_ARCH_OBJ_REF); diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c index 50561450cf31..eb72a9a8802a 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c @@ -1085,7 +1085,7 @@ ParseCmObjDesc ( ParserArray = &StdNamespaceObjectParser[ObjId]; break; - case EObjNameSpaceArm: + case EObjNameSpaceArch: if (ObjId >= EArchObjMax) { ASSERT (0); return; -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113468): https://edk2.groups.io/g/devel/message/113468 Mute This Topic: https://groups.io/mt/103622717/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-