]> git.proxmox.com Git - mirror_edk2.git/blobdiff - Tools/XMLSchema/FrameworkDataAttributes.xsd
Sync the type of <VariableName> with the latest email send by Larry.
[mirror_edk2.git] / Tools / XMLSchema / FrameworkDataAttributes.xsd
index cf95629f5c144ade49796f37f2178bb23f1d6a08..5e6bf5bcbf5a4d78e7a62de5d5a3dc7d4f0a6051 100644 (file)
     </xs:annotation>\r
     <xs:include schemaLocation="NamingConvention.xsd"/>\r
     <xs:include schemaLocation="FrameworkDataTypes.xsd"/>\r
+    <xs:include schemaLocation="FrameworkPlatformDataTypes.xsd"/>\r
+    <xs:attributeGroup name="BlockAttributes">\r
+        <xs:attribute name="Name" type="BlockNameType" use="required"/>\r
+        <xs:attribute name="Size" type="HexAddressType" use="required"/>\r
+        <xs:attribute name="Flags" type="HexAddressType" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="FlashDeviceImageAttributes">\r
+        <xs:attribute name="Name" type="xs:string" use="required"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="FlashDeviceImageFileAttributes">\r
+        <xs:attribute name="Name" type="xs:string" use="required"/>\r
+        <xs:attribute name="Region" type="xs:string" use="required"/>\r
+        <xs:attribute name="SubRegion" type="xs:string" use="optional"/>\r
+        <xs:attribute name="Optional" type="xs:boolean" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="FlashDeviceInfoAttributes">\r
+        <xs:attribute name="Name" type="xs:string" use="required"/>\r
+        <xs:attribute name="Size" type="HexAddressType" use="required"/>\r
+        <xs:attribute name="BaseAddress" type="HexAddressType" use="required"/>\r
+        <xs:attribute name="ErasePolarity" type="Polarity" use="required"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="RawDataAttributes">\r
+        <xs:attribute name="Name" type="xs:string" use="required"/>\r
+        <xs:attribute name="Region" type="xs:string" use="required"/>\r
+        <xs:attribute name="SubRegion" type="xs:string" use="required"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="RegionAttributes">\r
+        <xs:attribute name="Name" type="xs:string" use="required"/>\r
+        <xs:attribute name="Size" type="HexAddressType" use="required"/>\r
+        <xs:attribute name="Flags" type="HexAddressType" use="optional"/>\r
+        <xs:attribute name="Alignment" type="HexAddressType" use="optional"/>\r
+        <xs:attribute name="Attributes" type="xs:string" use="required"/>\r
+        <xs:attribute name="AreaType" type="EfiFvAreaType" use="required"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="SubRegionAttributes">\r
+        <xs:attribute name="CreateHob" type="xs:boolean" use="required"/>\r
+        <xs:attribute name="Name" type="xs:string" use="required"/>\r
+        <xs:attribute name="Size" type="HexAddressType" use="required"/>\r
+        <xs:attribute name="Attributes" type="xs:string" use="required"/>\r
+        <xs:attribute name="AreaType" type="EfiFvAreaType" use="required"/>\r
+        <xs:attribute name="NameGuid" type="xs:string" use="required"/>\r
+        <xs:attribute name="AreaTypeGuid" type="xs:string" use="optional"/>\r
+        <xs:attribute name="FileSystemGuid" type="xs:string" use="optional"/>\r
+    </xs:attributeGroup>\r
     <xs:attributeGroup name="BaseNameAttributes">\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="BootModeAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
         <xs:attribute name="BootModeName" type="BootModeNames" use="required"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <!-- DO NOT USE, remove Guid from use -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <!-- Make Usage REQUIRED in final -->\r
         <xs:attribute name="Usage" type="BootModeUsage" use="required"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
         <xs:attribute default="Unicode" name="OutputFiletype" type="xs:string" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="DataHubAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <!-- DO NOT USE, remove Guid from use -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <!-- Make Usage REQUIRED in final -->\r
         <xs:attribute name="Usage" type="DataHubUsage" use="optional"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
         <xs:attribute name="Separator" type="ToothPick"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="EventAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <!-- Make EventGroup Required in final -->\r
         <xs:attribute name="EventGroup" type="EventTypes" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <!-- DO NOT USE, remove Guid from use -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <!-- Make Usage REQUIRED in final -->\r
         <xs:attribute name="Usage" type="EventUsage" use="optional"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="ExternAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="FilenameAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
-        <!-- LAH Does a Filename need to have FeatureFlag Attribute? -->\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="FileType" type="xs:string" use="optional"/>\r
+        <!-- DO NOT USE, remove Guid from use -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <!-- DO NOT USE, remove Path from use -->\r
         <xs:attribute name="Path" type="DirectoryNamingConvention" use="optional"/>\r
+        <!-- DO NOT USE, remove ToolChain from use, use ToolChainFamily -->\r
         <xs:attribute name="ToolChain" type="ToolChains" use="optional"/>\r
+        <xs:attribute name="TagName" type="xs:NCName" use="optional"/>\r
+        <xs:attribute name="ToolCode" type="xs:NCName" use="optional"/>\r
+        <xs:attribute name="ToolChainFamily" type="xs:NCName" use="optional"/>\r
+        <!-- DO NOT USE, remove Usage from use -->\r
         <xs:attribute name="Usage" type="FileNameUsage" use="optional"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="FormsetAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="GuidAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <!-- Make Usage REQUIRED in final -->\r
         <xs:attribute name="Usage" type="GuidUsage" use="optional"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
+    <xs:attributeGroup name="GuidDeclarationAttributes">\r
+        <xs:attribute name="Name" type="xs:NCName" use="required"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <xs:attribute name="ModuleTypeList" type="ModuleTypeList" use="optional"/>\r
+        <xs:attribute name="GuidTypeList" type="GuidListType" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="HiiPackageAttributes">\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <xs:attribute name="Usage" type="HiiPackageUsage" use="required"/>\r
+    </xs:attributeGroup>\r
     <xs:attributeGroup name="HobAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <!-- DO NOT USE remove Guid from use -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <xs:attribute name="HobType" type="HobTypes" use="required"/>\r
+        <!-- DO NOT USE remove HobEnabled from use -->\r
         <xs:attribute default="true" name="HobEnabled" type="xs:boolean" use="optional"/>\r
+        <!-- USAGE is required in final -->\r
         <xs:attribute name="Usage" type="HobUsage" use="optional"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
+    <!-- DO NOT USE remove IncludeAttributes from use -->\r
     <xs:attributeGroup name="IncludeAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <!-- DO NOT USE remove Class from use -->\r
         <xs:attribute name="Class" type="BaseNameConvention" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
-        <!-- LAH Does a Include need to have FeatureFlag Attribute? -->\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <!-- DO NOT USE remove Guid from use -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <xs:attribute name="ModuleType" type="ModuleTypeDef" use="optional"/>\r
+        <!-- DO NOT USE remove Path from use -->\r
         <xs:attribute name="Path" type="DirectoryNamingConvention" use="optional"/>\r
+        <!-- DO NOT USE remove Version from use -->\r
         <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="ModuleTypeList" type="ModuleTypeList" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="IncludeHeaderAttributes">\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <xs:attribute name="ModuleTypeList" type="ModuleTypeList" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="IndustryStdHeaderAttributes">\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <xs:attribute name="ModuleTypeList" type="ModuleTypeList" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="LibraryAttributes">\r
-        <!-- LibraryAttributes is used for Libraries -> Library elements in FPD files -->\r
+        <!-- LibraryAttributes is used for Libraries / Library elements in FPD files -->\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <!-- LAH Does a LibraryInstance need to have FeatureFlag Attribute? -->\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="LibraryClassAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
-        <xs:attribute name="RecommendedInstance" type="xs:NCName" use="optional"/>\r
+        <xs:attribute name="RecommendedInstanceVersion" type="xs:decimal" use="optional"/>\r
         <xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>\r
         <xs:attribute name="Usage" type="LibraryUsage" use="required"/>\r
     </xs:attributeGroup>\r
+    <xs:attributeGroup name="MsaGuidAttributes">\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <xs:attribute name="Usage" type="GuidUsage" use="optional"/>\r
+    </xs:attributeGroup>\r
     <xs:attributeGroup name="ModuleNameAttributes">\r
         <xs:attribute name="Guid" type="GuidType" use="required"/>\r
         <!-- DO NOT USE remove Guid from use, Start using ModuleGuid instead -->\r
         <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="MsaAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
         <xs:attribute name="BuildSequence" type="xs:int" use="optional"/>\r
         <xs:attribute name="FvBinding" type="xs:string" use="optional"/>\r
         <xs:attribute name="ModuleName" type="xs:NCName" use="optional"/>\r
         <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="OptionAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
         <xs:attribute name="BuildTarget" type="BuildTargets" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <!-- LAH Does an Option need to have FeatureFlag Attribute? -->\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="Platform" type="PlatformNamingConvention" use="optional"/>\r
         <xs:attribute name="ToolChain" type="ToolChains" use="optional"/>\r
+        <xs:attribute name="ToolChainTag" type="xs:NCName" use="optional"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
+    <xs:attributeGroup name="PackageHeaderAttributes">\r
+        <xs:attribute name="ModuleType" type="ModuleTypeDef" use="optional"/>\r
+    </xs:attributeGroup>\r
     <xs:attributeGroup name="PackageAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
         <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r
         <xs:attribute name="PackageType" type="PackageType" use="optional"/>\r
         <xs:attribute name="PackageVersion" type="xs:string" use="optional"/>\r
     </xs:attributeGroup>\r
     <!-- PackageNameAttributres are only used in the Package Dependencies section of an SPD file. -->\r
     <xs:attributeGroup name="PackageNameAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
         <!-- DO NOT USE remove Guid and start using PackageGuid instead -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <!-- CHANGE PackageGuid to REQUIRED in final -->\r
         <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r
+        <!-- DO NOT USE remove PackageTypeDependency from Use -->\r
         <!-- PackageTypeDepencency is used to identify if a SOURCE or BINARY PackageType is required, in case PackageGuid and/or PackageVersion are not tracked. -->\r
         <xs:attribute name="PackageTypeDependency" type="PackageType" use="optional"/>\r
         <xs:attribute name="PackageVersion" type="xs:string" use="optional"/>\r
             <xs:documentation xml:lang="en">PcdUsage is only valid for PcdItemTypes = FEATURE_FLAG</xs:documentation>\r
             <xs:documentation xml:lang="en">Only NON FEATURE_FLAG PCDS should have the FeatureFlag attribute set.</xs:documentation>\r
         </xs:annotation>\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="ItemType" type="PcdItemTypes" use="required"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
+    <xs:attributeGroup name="PcdBuildDefinitionAttributes">\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="ItemType" type="PcdItemTypes" use="required"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="PcdDeclarationAttributes">\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <xs:attribute name="SupModuleTypes" type="ModuleTypeList" use="optional"/>\r
+    </xs:attributeGroup>\r
     <xs:attributeGroup name="PlatformAttributes">\r
         <!-- DO NOT USE remove AlternateName from use -->\r
         <xs:attribute name="AlternateName" type="FileNameConvention" use="optional"/>\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
         <!-- DO NOT USE remove Guid from use -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <xs:attribute name="PlatformName" type="PlatformNamingConvention" use="optional"/>\r
         <!-- DO NOT USE remove Version and start using PlatformVersion instead -->\r
         <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
     </xs:attributeGroup>\r
+    <xs:attributeGroup name="PpiDeclarationAttributes">\r
+        <xs:attribute name="Name" type="xs:NCName" use="required"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <xs:attribute name="ModuleTypeList" type="ModuleTypeList" use="optional"/>\r
+    </xs:attributeGroup>\r
     <xs:attributeGroup name="PpiAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <!-- DO NOT USE remove Guid from use -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <!-- Make Usage REQUIRED in final -->\r
         <xs:attribute name="Usage" type="PpiUsage" use="optional"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="PpiNotifyAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <!-- DO NOT USE remove Guid from use -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <!-- Make Usage REQUIRED in final -->\r
         <xs:attribute name="Usage" type="PpiNotifyUsage" use="optional"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="ProtocolAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead-->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <!-- DO NOT USE remove Guid from use -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <!-- Make Usage REQUIRED in final -->\r
         <xs:attribute name="Usage" type="ProtocolUsage" use="optional"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
+    <xs:attributeGroup name="ProtocolDeclarationAttributes">\r
+        <xs:attribute name="Name" type="xs:NCName" use="required"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <xs:attribute name="ModuleTypeList" type="ModuleTypeList" use="optional"/>\r
+    </xs:attributeGroup>\r
     <xs:attributeGroup name="ProtocolNotifyAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <!-- DO NOT USE remove Guid from use -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <!-- Make Usage REQUIRED in final -->\r
         <xs:attribute name="Usage" type="ProtocolNotifyUsage" use="optional"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
         </xs:annotation>\r
         <xs:attribute name="BindingOrder" type="xs:int" use="optional"/>\r
         <xs:attribute default="true" name="Compressible" type="xs:boolean" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <!-- LAH Does a Section need to have FeatureFlag Attribute? -->\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         </xs:annotation>\r
         <xs:attribute name="EncapsulationType" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="EncapsulationTag" type="xs:string" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <!-- LAH Does a Filename need to have FeatureFlag Attribute? -->\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="SystemTableAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <!-- DO NOT USE remove Guid from use -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <!-- Make Usage REQUIRED in final -->\r
         <xs:attribute name="Usage" type="SystemTableUsage" use="optional"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
         <xs:attribute name="Url" type="xs:anyURI"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="VariableAttributes">\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <!-- DO NOT USE remove EnableFeature from use -->\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <!-- DO NOT USE remove Guid from use -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <!-- Make Usage REQUIRED in final -->\r
         <xs:attribute name="Usage" type="VariableUsage" use="optional"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r