merged the new changes in new schema, and corrected many inconsistencies in attribute...

[mirror_edk2.git] / Tools / XMLSchema / FrameworkDataAttributes.xsd

diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
index 67a1a5cb6ceb9bdb2691329d7345dec368216dfc..b08c8b7b86dfef149c7304073b478895a6884318 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataAttributes.xsd
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -66,15 +66,15 @@
         <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="BootModeAttributes">\r
+        <!-- Make Usage REQUIRED in final -->\r
+        <xs:attribute name="BootModeName" type="BootModeNames" use="required"/>\r
+        <xs:attribute name="Usage" type="BootModeUsage" use="required"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" 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="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:attributeGroup>\r
@@ -84,16 +84,16 @@
         <xs:attribute default="Unicode" name="OutputFiletype" type="xs:string" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="DataHubAttributes">\r
+        <!-- Make Usage REQUIRED in final -->\r
+        <xs:attribute name="Usage" type="DataHubUsage" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" 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="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:attributeGroup>\r
@@ -101,43 +101,46 @@
         <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="SupArchList" type="ArchListType" use="optional"/>\r
+        <!-- Make Usage REQUIRED in final -->\r
+        <xs:attribute name="Usage" type="EventUsage" use="optional"/>\r
         <!-- Make EventGroup Required in final -->\r
         <xs:attribute name="EventGroup" type="EventTypes" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
+        <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
+        <xs:attribute name="Arch" type="SupportedArchitectures" 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
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" 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="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="Usage" type="ExternUsage" 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="FilenameAttributes">\r
+        <xs:attribute name="TagName" type="ToolsNameConvention" use="optional"/>\r
+        <xs:attribute name="ToolCode" type="ToolsNameConvention" use="optional"/>\r
+        <xs:attribute name="ToolChainFamily" type="ToolsNameConvention" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" 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="SupArchList" type="ArchListType" use="optional"/>\r
         <xs:attribute name="ModuleName" type="xs:NCName" use="optional"/>\r
         <xs:attribute name="ModuleVersion" type="VersionDataType" use="optional"/>\r
         <xs:attribute name="ModuleGuid" type="GuidType" 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="FileType" type="xs:string" use="optional"/>\r
         <!-- DO NOT USE, remove Guid from use -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
@@ -145,9 +148,6 @@
         <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
@@ -159,50 +159,50 @@
         <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="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <xs:attribute name="Usage" type="FormSetUsage" 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="GuidAttributes">\r
+        <!-- Make Usage REQUIRED in final -->\r
+        <xs:attribute name="Usage" type="GuidUsage" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" 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="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="Name" type="UiNameType" 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="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
+        <xs:attribute name="SupModuleList" type="ModuleListType" 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:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="HobAttributes">\r
+        <!-- USAGE is required in final -->\r
+        <xs:attribute name="Usage" type="HobUsage" use="optional"/>\r
+        <xs:attribute name="HobType" type="HobTypes" use="required"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" 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="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
@@ -215,7 +215,7 @@
         <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
-        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" 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
@@ -229,14 +229,14 @@
     </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="FeatureFlag" type="FeatureFlagExpressionType" 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:attribute name="Name" type="KeywordType" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
+        <xs:attribute name="SupModuleList" type="ModuleListType" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="LibraryAttributes">\r
         <!-- LibraryAttributes is used for Libraries / Library elements in FPD files -->\r
@@ -246,7 +246,7 @@
         <!-- 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="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
         <!-- DO NOT USE remove Guid from use, Start using ModuleGuid instead -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <!-- DO NOT USE remove ClassGuid from use, Start using LibraryClassGuid instead -->\r
@@ -269,18 +269,18 @@
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="LibraryClassAttributes">\r
+        <xs:attribute name="Usage" type="LibraryUsage" use="required"/>\r
+        <xs:attribute name="RecommendedInstanceVersion" type="VersionDataType" use="optional"/>\r
+        <xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
+        <xs:attribute name="Name" type="KeywordType" 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="SupArchList" type="ArchListType" use="optional"/>\r
-        <xs:attribute name="FeatureFlag" type="xs:normalizedString" 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:attribute name="Name" type="xs:normalizedString" use="optional"/>\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="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
         <xs:attribute name="Usage" type="GuidUsage" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="ModuleNameAttributes">\r
@@ -302,8 +302,13 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="FfsAttributes">\r
         <xs:attribute name="FfsFormatKeyword" type="FfsNameType" use="required"/>\r
+        <xs:attribute name="FfsFileType" type="EfiFfsFileTypes" use="optional"/>\r
+        <xs:attribute name="FfsAttribTailPresent" type="xs:boolean" use="optional"/>\r
+        <xs:attribute name="FfsAttribRecovery" type="xs:boolean" use="optional" default="false"/>\r
+        <xs:attribute name="FfsAttribDataAlignment" type="FfsDataAlignmentType" use="optional"/>\r
+        <xs:attribute name="FfsAttribChecksumRequired" type="xs:boolean" use="optional" default="true"/>\r
         <xs:attribute name="SupModuleList" type="ModuleListType" use="optional"/>\r
-    </xs:attributeGroup>    \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
@@ -312,21 +317,24 @@
         <xs:attribute name="FvBinding" type="xs:string" use="optional"/>\r
         <xs:attribute name="ModuleName" type="xs:NCName" use="optional"/>\r
         <xs:attribute name="ModuleGuid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="ModuleVersion" type="VersionDataType" use="optional"/>\r
+        <xs:attribute name="PackageVersion" type="VersionDataType" use="optional"/>\r
         <xs:attribute name="PackageName" type="BaseNameConvention" use="optional"/>\r
         <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="OptionAttributes">\r
+        <xs:attribute name="BuildTargets" type="BuildTargetList" use="optional"/>\r
+        <xs:attribute name="ToolChainFamily" type="ToolsNameConvention" use="optional"/>\r
+        <xs:attribute name="TagName" type="ToolsNameConvention" use="optional"/>\r
+        <xs:attribute name="ToolCommand" type="ToolsNameConvention" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" 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="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="FeatureFlag" type="FeatureFlagExpressionType" 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
@@ -334,12 +342,13 @@
         <xs:attribute name="ModuleType" type="ModuleTypeDef" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="PackageAttributes">\r
+        <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="PackageVersion" type="VersionDataType" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" 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="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:attribute name="UpdatedDate" type="DateType" use="optional"/>\r
         <xs:attribute name="Usage" type="PackageUsage" use="optional"/>\r
     </xs:attributeGroup>\r
@@ -370,7 +379,7 @@
         <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="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
         <xs:attribute name="ItemType" type="PcdItemTypes" use="required"/>\r
         <xs:attribute name="PcdUsage" type="PcdUsage" use="optional"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
@@ -382,7 +391,7 @@
     </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="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
         <xs:attribute name="SupModuleTypes" type="ModuleTypeList" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="PlatformAttributes">\r
@@ -400,68 +409,68 @@
         <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="Name" type="UiNameType" 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="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
+        <xs:attribute name="SupModuleList" type="ModuleListType" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="PpiAttributes">\r
+        <!-- Make Usage REQUIRED in final -->\r
+        <xs:attribute name="Usage" type="PpiUsage" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" 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="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
+        <!-- Make Usage REQUIRED in final -->\r
+        <xs:attribute name="Usage" type="PpiNotifyUsage" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" 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="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
+        <!-- Make Usage REQUIRED in final -->\r
+        <xs:attribute name="Usage" type="ProtocolUsage" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" 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="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="Name" type="UiNameType" 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="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
+        <xs:attribute name="SupModuleList" type="ModuleListType" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="ProtocolNotifyAttributes">\r
+        <!-- Make Usage REQUIRED in final -->\r
+        <xs:attribute name="Usage" type="ProtocolNotifyUsage" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" 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="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:attributeGroup>\r
@@ -474,7 +483,7 @@
         <!-- 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:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
         <xs:attribute name="SectionType" type="EfiSectionType" use="optional"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
@@ -488,21 +497,21 @@
         <!-- 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="FeatureFlag" type="FeatureFlagExpressionType" 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="SystemTableAttributes">\r
+        <!-- Make Usage REQUIRED in final -->\r
+        <xs:attribute name="Usage" type="SystemTableUsage" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" 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="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:attributeGroup>\r
@@ -510,17 +519,28 @@
         <xs:attribute name="Url" type="xs:anyURI"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="VariableAttributes">\r
+        <!-- Make Usage REQUIRED in final -->\r
+        <xs:attribute name="Usage" type="VariableUsage" use="optional"/>\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" 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="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
     </xs:attributeGroup>\r
+    <xs:attributeGroup name="ProcessStepAttributes">\r
+        <xs:annotation>\r
+            <xs:documentation xml:lang="en">Attributes are either compressable and/or sequence order binding</xs:documentation>\r
+        </xs:annotation>\r
+        <xs:attribute name="BindingOrder" type="xs:int" use="optional"/>\r
+        <xs:attribute name="SectionType" type="EfiSectionType" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="FvRegionNameAttributes">\r
+        <xs:attribute name="BaseAddressPcdCName" type="C_NameType" use="required"/>\r
+        <xs:attribute name="BaseAddressPcdTokenSpaceGuid" type="GuidType" use="optional"/>\r
+    </xs:attributeGroup>    \r
 </xs:schema>\r