X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FXMLSchema%2FFrameworkDataAttributes.xsd;h=eb82e73da68046f0a0890d112380a38a08298651;hb=c12c6c7dc6051365bbbe0eefd123f88b58177d60;hp=cf95629f5c144ade49796f37f2178bb23f1d6a08;hpb=47d0b5817022d27a91426889d3ee92bee0a554be;p=mirror_edk2.git

diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
index cf95629f5c..eb82e73da6 100644
--- a/Tools/XMLSchema/FrameworkDataAttributes.xsd
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -23,7 +23,7 @@
     </xs:attributeGroup>
     <xs:attributeGroup name="BootModeAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute name="BootModeName" type="BootModeNames" use="required"/>
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
         <xs:attribute name="Guid" type="GuidType" use="optional"/>
@@ -38,7 +38,7 @@
     </xs:attributeGroup>
     <xs:attributeGroup name="DataHubAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
         <xs:attribute name="Guid" type="GuidType" use="optional"/>
@@ -51,7 +51,7 @@
     </xs:attributeGroup>
     <xs:attributeGroup name="EventAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute name="EventGroup" type="EventTypes" use="optional"/>
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
@@ -62,7 +62,7 @@
     </xs:attributeGroup>
     <xs:attributeGroup name="ExternAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
         <xs:attribute name="Guid" type="GuidType" use="optional"/>
@@ -72,7 +72,7 @@
     </xs:attributeGroup>
     <xs:attributeGroup name="FilenameAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
         <!-- LAH Does a Filename need to have FeatureFlag Attribute? -->
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
@@ -86,7 +86,7 @@
     </xs:attributeGroup>
     <xs:attributeGroup name="FormsetAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
         <xs:attribute name="Guid" type="GuidType" use="optional"/>
@@ -96,7 +96,7 @@
     </xs:attributeGroup>
     <xs:attributeGroup name="GuidAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
         <xs:attribute name="Usage" type="GuidUsage" use="optional"/>
@@ -105,7 +105,7 @@
     </xs:attributeGroup>
     <xs:attributeGroup name="HobAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
         <xs:attribute name="Guid" type="GuidType" use="optional"/>
@@ -115,9 +115,10 @@
         <!-- DO NOT USE remove OverrideID from use -->
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
     </xs:attributeGroup>
+    <!-- DO NOT USE remove IncludeAttributes from use -->
     <xs:attributeGroup name="IncludeAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute name="Class" type="BaseNameConvention" use="optional"/>
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
         <!-- LAH Does a Include need to have FeatureFlag Attribute? -->
@@ -129,10 +130,20 @@
         <!-- DO NOT USE remove OverrideID from use -->
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
     </xs:attributeGroup>
+    <xs:attributeGroup name="IncludeHeaderAttributes">
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
+        <xs:attribute name="ModuleTypeList" type="ModuleTypeList" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="IndustryStdHeaderAttributes">
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
+        <xs:attribute name="ModuleTypeList" type="ModuleTypeList" use="optional"/>
+    </xs:attributeGroup>
     <xs:attributeGroup name="LibraryAttributes">
         <!-- LibraryAttributes is used for Libraries -> Library elements in FPD files -->
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
         <!-- LAH Does a LibraryInstance need to have FeatureFlag Attribute? -->
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
@@ -159,7 +170,7 @@
     </xs:attributeGroup>
     <xs:attributeGroup name="LibraryClassAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
         <xs:attribute name="RecommendedInstance" type="xs:NCName" use="optional"/>
         <xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>
@@ -184,7 +195,7 @@
     </xs:attributeGroup>
     <xs:attributeGroup name="MsaAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute name="BuildSequence" type="xs:int" use="optional"/>
         <xs:attribute name="FvBinding" type="xs:string" use="optional"/>
         <xs:attribute name="ModuleName" type="xs:NCName" use="optional"/>
@@ -194,19 +205,20 @@
     </xs:attributeGroup>
     <xs:attributeGroup name="OptionAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute name="BuildTarget" type="BuildTargets" use="optional"/>
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
         <!-- LAH Does an Option need to have FeatureFlag Attribute? -->
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
         <xs:attribute name="Platform" type="PlatformNamingConvention" use="optional"/>
         <xs:attribute name="ToolChain" type="ToolChains" use="optional"/>
+        <xs:attribute name="ToolChainTag" type="xs:NCName" use="optional"/>
         <!-- DO NOT USE remove OverrideID from use -->
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
     </xs:attributeGroup>
     <xs:attributeGroup name="PackageAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>
         <xs:attribute name="PackageType" type="PackageType" use="optional"/>
         <xs:attribute name="PackageVersion" type="xs:string" use="optional"/>
@@ -216,7 +228,7 @@
     <!-- PackageNameAttributres are only used in the Package Dependencies section of an SPD file. -->
     <xs:attributeGroup name="PackageNameAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <!-- DO NOT USE remove Guid and start using PackageGuid instead -->
         <xs:attribute name="Guid" type="GuidType" use="optional"/>
         <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>
@@ -233,7 +245,7 @@
             <xs:documentation xml:lang="en">Only NON FEATURE_FLAG PCDS should have the FeatureFlag attribute set.</xs:documentation>
         </xs:annotation>
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
         <xs:attribute name="ItemType" type="PcdItemTypes" use="required"/>
@@ -241,11 +253,16 @@
         <!-- DO NOT USE remove OverrideID from use -->
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
     </xs:attributeGroup>
+    <xs:attributeGroup name="PcdDeclarationAttributes">
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
+        <xs:attribute name="SupModuleTypes" type="ModuleTypeList" use="optional"/>
+    </xs:attributeGroup>
     <xs:attributeGroup name="PlatformAttributes">
         <!-- DO NOT USE remove AlternateName from use -->
         <xs:attribute name="AlternateName" type="FileNameConvention" use="optional"/>
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <!-- DO NOT USE remove Guid from use -->
         <xs:attribute name="Guid" type="GuidType" use="optional"/>
         <xs:attribute name="PlatformName" type="PlatformNamingConvention" use="optional"/>
@@ -256,7 +273,7 @@
     </xs:attributeGroup>
     <xs:attributeGroup name="PpiAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
         <xs:attribute name="Guid" type="GuidType" use="optional"/>
@@ -266,7 +283,7 @@
     </xs:attributeGroup>
     <xs:attributeGroup name="PpiNotifyAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
         <xs:attribute name="Guid" type="GuidType" use="optional"/>
@@ -276,7 +293,7 @@
     </xs:attributeGroup>
     <xs:attributeGroup name="ProtocolAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
         <xs:attribute name="Guid" type="GuidType" use="optional"/>
@@ -286,7 +303,7 @@
     </xs:attributeGroup>
     <xs:attributeGroup name="ProtocolNotifyAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
         <xs:attribute name="Guid" type="GuidType" use="optional"/>
         <xs:attribute name="Usage" type="ProtocolNotifyUsage" use="optional"/>
@@ -320,7 +337,7 @@
     </xs:attributeGroup>
     <xs:attributeGroup name="SystemTableAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
         <xs:attribute name="Guid" type="GuidType" use="optional"/>
@@ -333,7 +350,7 @@
     </xs:attributeGroup>
     <xs:attributeGroup name="VariableAttributes">
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
         <xs:attribute name="Guid" type="GuidType" use="optional"/>