Added some attributes (changed comments to be before items to be deleted) Added a couple of new elements that will be used in final output.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@411 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 224 insertions, 132 deletions

diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
index eccb361128..cf95629f5c 100644
--- a/Tools/XMLSchema/FrameworkDataAttributes.xsd
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -22,261 +22,289 @@
         <xs:attribute name="Version" type="VersionDataType" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="BootModeAttributes">

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>

         <xs:attribute name="BootModeName" type="BootModeNames" use="required"/>

-        <xs:attribute name="Usage" type="BootModeUsage" use="required"/>

-        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>

         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

+        <xs:attribute name="Guid" type="GuidType" use="optional"/>

+        <xs:attribute name="Usage" type="BootModeUsage" use="required"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="ConvertAttributeString">

+        <xs:attribute name="OutputFilename" type="FileNameConvention" use="optional"/>

         <xs:attribute name="SourceString" type="xs:string" use="optional"/>

         <xs:attribute default="Unicode" name="OutputFiletype" type="xs:string" use="optional"/>

-        <xs:attribute name="OutputFilename" type="FileNameConvention" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="DataHubAttributes">

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>

-        <xs:attribute name="Usage" type="DataHubUsage" use="optional"/>

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="ArchType" type="ArchList" 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="OverrideID" type="xs:int" use="optional"/>

+        <xs:attribute name="Guid" type="GuidType" use="optional"/>

+        <xs:attribute name="Usage" type="DataHubUsage" use="optional"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="DirectoryAttributes">

         <xs:attribute name="Separator" type="ToothPick"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="EventAttributes">

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>

-        <xs:attribute name="Usage" type="EventUsage" use="optional"/>

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="ArchType" type="ArchList" 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"/>

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

+        <xs:attribute name="Guid" type="GuidType" use="optional"/>

+        <xs:attribute name="Usage" type="EventUsage" use="optional"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="ExternAttributes">

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>

-        <xs:attribute name="Usage" type="ExternUsage" use="optional"/>

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="ArchType" type="ArchList" 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="OverrideID" type="xs:int" use="optional"/>

+        <xs:attribute name="Guid" type="GuidType" use="optional"/>

+        <xs:attribute name="Usage" type="ExternUsage" use="optional"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="FilenameAttributes">

-        <xs:attribute name="Usage" type="FileNameUsage" use="optional"/>

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="ArchType" type="ArchList" 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"/>

+        <xs:attribute name="FileType" type="xs:string" use="optional"/>

         <xs:attribute name="Guid" type="GuidType" use="optional"/>

         <xs:attribute name="Path" type="DirectoryNamingConvention" use="optional"/>

-        <xs:attribute name="FileType" type="xs:string" use="optional"/>

         <xs:attribute name="ToolChain" type="ToolChains" 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="ArchType" use="optional">

-            <xs:simpleType>

-                <xs:list itemType="SupportedArchitectures"/>

-            </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

+        <xs:attribute name="Usage" type="FileNameUsage" use="optional"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="FormsetAttributes">

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>

-        <xs:attribute name="Usage" type="FormSetUsage" use="optional"/>

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="ArchType" type="ArchList" 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="OverrideID" type="xs:int" use="optional"/>

+        <xs:attribute name="Guid" type="GuidType" use="optional"/>

+        <xs:attribute name="Usage" type="FormSetUsage" use="optional"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="GuidAttributes">

-        <xs:attribute name="Usage" type="GuidUsage" use="optional"/>

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="ArchType" type="ArchList" 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="OverrideID" type="xs:int" use="optional"/>

+        <xs:attribute name="Usage" type="GuidUsage" use="optional"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="HobAttributes">

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="ArchType" type="ArchList" 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"/>

-        <xs:attribute name="Usage" type="HobUsage" use="optional"/>

         <xs:attribute name="HobType" type="HobTypes" use="required"/>

         <xs:attribute default="true" name="HobEnabled" type="xs:boolean" 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="OverrideID" type="xs:int" use="optional"/>

+        <xs:attribute name="Usage" type="HobUsage" use="optional"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="IncludeAttributes">

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>

-        <xs:attribute name="Path" type="DirectoryNamingConvention" use="optional"/>

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>

         <xs:attribute name="Class" type="BaseNameConvention" use="optional"/>

-        <xs:attribute name="Version" type="VersionDataType" use="optional"/>

         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>

+        <!-- LAH Does a Include need to have FeatureFlag Attribute? -->

         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

-        <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="Guid" type="GuidType" use="optional"/>

         <xs:attribute name="ModuleType" type="ModuleTypeDef" use="optional"/>

+        <xs:attribute name="Path" type="DirectoryNamingConvention" use="optional"/>

+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>

+        <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" 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 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"/>

+        <!-- DO NOT USE remove Guid from use, Start using ModuleGuid instead -->

         <xs:attribute name="Guid" type="GuidType" use="optional"/>

-        <!-- DO NOT USE remove Guid from use, Start using LibraryGuid instead -->

+        <!-- DO NOT USE remove ClassGuid from use, Start using LibraryClassGuid instead -->

+        <xs:attribute name="ClassGuid" type="GuidType" use="optional"/>

+        <!-- DO NOT USE remove LibraryGuid from use, Start using ModuleGuid instead -->

         <xs:attribute name="LibraryGuid" type="GuidType" use="optional"/>

-        <xs:attribute name="Version" type="VersionDataType" use="optional"/>

-        <!-- DO NOT USE remove Version from use, Start using LibraryVersion instead -->

-        <xs:attribute name="ModuleVersion" type="VersionDataType" use="optional"/>

         <xs:attribute name="LibraryClass" type="BaseNameConvention" use="optional"/>

-        <xs:attribute name="ClassGuid" type="GuidType" use="optional"/>

-        <xs:attribute name="Usage" type="LibraryUsage" use="optional"/>

-        <xs:attribute name="Package" type="xs:string" use="optional"/>

+        <xs:attribute name="LibraryClassGuid" type="GuidType" use="optional"/>

+        <xs:attribute name="ModuleGuid" type="GuidType" use="optional"/>

+        <xs:attribute name="ModuleVersion" type="VersionDataType" use="optional"/>

         <!-- DO NOT USE remove Package from use, Start using PackageName instead -->

+        <xs:attribute name="Package" type="xs:string" use="optional"/>

+        <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>

         <xs:attribute name="PackageName" type="BaseNameConvention" use="optional"/>

         <xs:attribute name="PackageVersion" type="VersionDataType" use="optional"/>

-        <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>

-        <xs:attribute name="ArchType" use="optional">

-            <xs:simpleType>

-                <xs:list itemType="SupportedArchitectures"/>

-            </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>

-        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

+        <xs:attribute name="Usage" type="LibraryUsage" use="optional"/>

+        <!-- DO NOT USE remove Version from use, Start using ModuleVersion instead -->

+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

+    </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="FeatureFlag" type="xs:normalizedString" use="optional"/>

+        <xs:attribute name="RecommendedInstance" type="xs:NCName" use="optional"/>

+        <xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>

+        <xs:attribute name="Usage" type="LibraryUsage" use="required"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="ModuleNameAttributes">

         <xs:attribute name="Guid" type="GuidType" use="required"/>

+        <!-- DO NOT USE remove Guid from use, Start using ModuleGuid instead -->

+        <xs:attribute name="ModuleGuid" type="GuidType" use="required"/>

+        <xs:attribute name="ModuleVersion" type="VersionDataType" use="optional"/>

+        <!-- DO NOT USE remove Version from use, Start using ModuleVersion instead -->

         <xs:attribute name="Version" type="VersionDataType" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="ModuleNameSaAttributes">

+        <!-- DO NOT USE remove Guid from use, Start using ModuleGuid instead -->

         <xs:attribute name="Guid" type="GuidType" use="optional"/>

+        <xs:attribute name="ModuleGuid" type="GuidType" use="required"/>

         <xs:attribute name="ModuleName" type="xs:NCName" use="required"/>

+        <xs:attribute name="ModuleVersion" type="VersionDataType" use="optional"/>

+        <!-- DO NOT USE remove Version from use, Start using ModuleVersion instead -->

         <xs:attribute name="Version" type="VersionDataType" use="optional"/>

     </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="BuildSequence" type="xs:int" use="optional"/>

         <xs:attribute name="FvBinding" type="xs:string" use="optional"/>

         <xs:attribute name="ModuleName" type="xs:NCName" use="optional"/>

         <xs:attribute name="ModuleGuid" type="GuidType" use="optional"/>

         <xs:attribute name="PackageName" type="BaseNameConvention" use="optional"/>

         <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>

-        <xs:attribute name="BuildSequence" type="xs:int" use="optional"/>

-        <xs:attribute name="ArchType" use="optional">

-            <xs:simpleType>

-                <xs:list itemType="SupportedArchitectures"/>

-            </xs:simpleType>

-        </xs:attribute>

     </xs:attributeGroup>

     <xs:attributeGroup name="OptionAttributes">

-        <xs:attribute name="Platform" type="PlatformNamingConvention" use="optional"/>

-        <xs:attribute name="ToolChain" type="ToolChains" use="optional"/>

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="ArchType" type="ArchList" 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="OverrideID" type="xs:int" use="optional"/>

+        <xs:attribute name="Platform" type="PlatformNamingConvention" use="optional"/>

+        <xs:attribute name="ToolChain" type="ToolChains" 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="PackageGuid" type="GuidType" use="optional"/>

-        <xs:attribute name="PackageVersion" type="xs:string" use="optional"/>

-        <xs:attribute name="Usage" type="PackageUsage" use="optional"/>

         <xs:attribute name="PackageType" type="PackageType" use="optional"/>

+        <xs:attribute name="PackageVersion" type="xs:string" use="optional"/>

         <xs:attribute name="UpdatedDate" type="DateType" use="optional"/>

-        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="Usage" type="PackageUsage" use="optional"/>

     </xs:attributeGroup>

     <!-- PackageNameAttributres are only used in the Package Dependencies section of an SPD file. -->

     <xs:attributeGroup name="PackageNameAttributes">

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="ArchType" type="ArchList" 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"/>

-        <xs:attribute name="Version" type="VersionDataType" use="optional"/>

-        <!-- DO NOT USE remove Version and start using PackageVersion instead -->

-        <xs:attribute name="PackageVersion" type="xs:string" use="optional"/>

         <!-- PackageTypeDepencency is used to identify if a SOURCE or BINARY PackageType is required, in case PackageGuid and/or PackageVersion are not tracked. -->

         <xs:attribute name="PackageTypeDependency" type="PackageType" use="optional"/>

-        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="PackageVersion" type="xs:string" use="optional"/>

+        <!-- DO NOT USE remove Version and start using PackageVersion instead -->

+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="PcdAttributes">

         <xs:annotation>

             <xs:documentation xml:lang="en">These attributes are for the Pcds listed in PcdData, PcdEntry and/or PcdBuildData entries.</xs:documentation>

             <xs:documentation xml:lang="en">PcdUsage is only valid for PcdItemTypes = FEATURE_FLAG</xs:documentation>

+            <xs:documentation xml:lang="en">Only NON FEATURE_FLAG PCDS should have the FeatureFlag attribute set.</xs:documentation>

         </xs:annotation>

-        <xs:attribute name="ItemType" type="PcdItemTypes" use="required"/>

-        <xs:attribute name="PcdUsage" type="PcdUsage" use="optional"/>

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="ArchType" type="ArchList" 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="OverrideID" type="xs:int" use="optional"/>

+        <xs:attribute name="ItemType" type="PcdItemTypes" use="required"/>

+        <xs:attribute name="PcdUsage" type="PcdUsage" use="optional"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="PlatformAttributes">

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>

-        <!-- DO NOT USE remove Guid from use -->

-        <xs:attribute name="Version" type="VersionDataType" use="optional"/>

-        <xs:attribute name="AlternateName" type="FileNameConvention" use="optional"/>

         <!-- 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"/>

+        <!-- DO NOT USE remove Guid from use -->

+        <xs:attribute name="Guid" type="GuidType" use="optional"/>

         <xs:attribute name="PlatformName" type="PlatformNamingConvention" use="optional"/>

         <xs:attribute name="PlatformGuid" type="GuidType" use="optional"/>

         <xs:attribute name="PlatformVersion" type="xs:string" use="optional"/>

+        <!-- DO NOT USE remove Version and start using PlatformVersion instead -->

+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="PpiAttributes">

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>

-        <xs:attribute name="Usage" type="PpiUsage" use="optional"/>

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="ArchType" type="ArchList" 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="ArchType" use="optional">

-            <xs:simpleType>

-                <xs:list itemType="SupportedArchitectures"/>

-            </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

+        <xs:attribute name="Guid" type="GuidType" use="optional"/>

+        <xs:attribute name="Usage" type="PpiUsage" use="optional"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="PpiNotifyAttributes">

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>

-        <xs:attribute name="Usage" type="PpiNotifyUsage" use="optional"/>

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="ArchType" type="ArchList" 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="ArchType" use="optional">

-            <xs:simpleType>

-                <xs:list itemType="SupportedArchitectures"/>

-            </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

+        <xs:attribute name="Guid" type="GuidType" use="optional"/>

+        <xs:attribute name="Usage" type="PpiNotifyUsage" use="optional"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="ProtocolAttributes">

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>

-        <xs:attribute name="Usage" type="ProtocolUsage" use="optional"/>

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="ArchType" type="ArchList" 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="ArchType" use="optional">

-            <xs:simpleType>

-                <xs:list itemType="SupportedArchitectures"/>

-            </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

+        <xs:attribute name="Guid" type="GuidType" use="optional"/>

+        <xs:attribute name="Usage" type="ProtocolUsage" use="optional"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

     </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="FeatureFlag" type="xs:normalizedString" use="optional"/>

         <xs:attribute name="Guid" type="GuidType" use="optional"/>

         <xs:attribute name="Usage" type="ProtocolNotifyUsage" use="optional"/>

-        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>

-        <xs:attribute name="ArchType" use="optional">

-            <xs:simpleType>

-                <xs:list itemType="SupportedArchitectures"/>

-            </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="SectionAttributes">

         <xs:annotation>

             <xs:documentation xml:lang="en">Attributes are either compressable and/or sequence order binding</xs:documentation>

         </xs:annotation>

-        <xs:attribute name="SectionType" type="EfiSectionType" use="optional"/>

-        <xs:attribute default="true" name="Compressible" type="xs:boolean" use="optional"/>

         <xs:attribute name="BindingOrder" type="xs:int" use="optional"/>

+        <xs:attribute default="true" name="Compressible" type="xs:boolean" use="optional"/>

         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>

+        <!-- LAH Does a Section need to have FeatureFlag Attribute? -->

         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

+        <xs:attribute name="SectionType" type="EfiSectionType" use="optional"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="SectionsAttributes">

         <xs:annotation>

@@ -285,32 +313,32 @@
         <xs:attribute name="EncapsulationType" type="xs:normalizedString" use="optional"/>

         <xs:attribute name="EncapsulationTag" type="xs:string" 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"/>

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="SystemTableAttributes">

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>

-        <xs:attribute name="Usage" type="SystemTableUsage" use="optional"/>

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="ArchType" type="ArchList" 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="OverrideID" type="xs:int" use="optional"/>

+        <xs:attribute name="Guid" type="GuidType" use="optional"/>

+        <xs:attribute name="Usage" type="SystemTableUsage" use="optional"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="UrlAttribute">

         <xs:attribute name="Url" type="xs:anyURI"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="VariableAttributes">

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>

-        <xs:attribute name="Usage" type="VariableUsage" use="optional"/>

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>

+        <xs:attribute name="ArchType" type="ArchList" 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="ArchType" use="optional">

-            <xs:simpleType>

-                <xs:list itemType="SupportedArchitectures"/>

-            </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

+        <xs:attribute name="Guid" type="GuidType" use="optional"/>

+        <xs:attribute name="Usage" type="VariableUsage" use="optional"/>

         <!-- DO NOT USE remove OverrideID from use -->

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>

     </xs:attributeGroup>

 </xs:schema>

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index ffa1e7441f..08cbfd939b 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -254,7 +254,7 @@
                                     <xs:attributeGroup ref="EventAttributes"/>

                                 </xs:complexType>

                             </xs:element>

-                            <!-- Remove Arch Section and use Arch Attribute instead in above. -->

+                            <!-- Remove Arch Section and use Arch Attribute instead in Event. -->

                             <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">

                                 <xs:complexType>

                                     <xs:sequence>

@@ -295,7 +295,7 @@
                                     <xs:attributeGroup ref="EventAttributes"/>

                                 </xs:complexType>

                             </xs:element>

-                            <!-- Remove Arch and use Arch attribute in above -->

+                            <!-- Remove Arch and use Arch attribute in Event above -->

                             <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">

                                 <xs:complexType>

                                     <xs:sequence>

@@ -483,6 +483,7 @@
                         </xs:simpleContent>

                     </xs:complexType>

                 </xs:element>

+                <!-- DO NOT USE! removing Arch element, use Arch attribute in Formset instead. -->

                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">

                     <xs:complexType>

                         <xs:sequence>

@@ -548,8 +549,8 @@
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>

                             <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>

                             <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>

+                            <!-- DO NOT USE remove ConditionalExpression and use FeatureFlag instead -->

                             <xs:element minOccurs="0" maxOccurs="unbounded" ref="ConditionalExpression"/>

-                            <!-- DO NOT USE remove and use FeatureFlag instead -->

                             <xs:element minOccurs="0" maxOccurs="1" ref="DefaultValue"/>

                             <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>

                         </xs:sequence>

@@ -569,8 +570,8 @@
                                         <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>

                                         <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>

                                         <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>

+                                        <!-- DO NOT USE remove ConditionalExpression and use FeatureFlag instead -->

                                         <xs:element minOccurs="0" maxOccurs="unbounded" ref="ConditionalExpression"/>

-                                        <!-- DO NOT USE remove and use FeatureFlag instead -->

                                         <xs:element minOccurs="0" maxOccurs="1" ref="DefaultValue"/>

                                         <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>

                                     </xs:sequence>

@@ -700,9 +701,7 @@
         <xs:complexType>

             <xs:simpleContent>

                 <xs:extension base="BaseNameConvention">

-                    <xs:attribute name="Usage" type="LibraryUsage" use="required"/>

-                    <xs:attribute name="RecommendedInstance" type="xs:NCName" use="optional"/>

-                    <xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>

+                    <xs:attributeGroup ref="LibraryClassAttributes"/>

                 </xs:extension>

             </xs:simpleContent>

         </xs:complexType>

@@ -865,6 +864,30 @@
             </xs:sequence>

         </xs:complexType>

     </xs:element>

+    <xs:element name="MsaPcdDeclarations">

+        <xs:annotation>

+            <xs:documentation xml:lang="en">Child of Module Surface Area Description (MSA)</xs:documentation>

+        </xs:annotation>

+        <xs:complexType>

+            <xs:sequence minOccurs="1">

+                <xs:element maxOccurs="unbounded" name="PcdEntry">

+                    <xs:annotation>

+                        <xs:documentation xml:lang="en">This is the valid content of the PCD table of a Module. The contents may not be wired at build time, and these only refer to Platform Build values, not modules.</xs:documentation>

+                        <xs:documentation xml:lang="en">This element is valid for PcdInfo.xml and FPD files.</xs:documentation>

+                    </xs:annotation>

+                    <xs:complexType>

+                        <xs:sequence>

+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>

+                            <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValue"/>

+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>

+                        </xs:sequence>

+                        <!-- MSA file declares a single usage, and must match one of the entries in what the SPD file declares as the set of possible Item Types. -->

+                        <xs:attribute name="PcdItemType" type="PcdItemTypes" use="required"/>

+                    </xs:complexType>

+                </xs:element>

+            </xs:sequence>

+        </xs:complexType>

+    </xs:element>

     <xs:element name="OutputDirectory">

         <xs:annotation>

             <xs:documentation xml:lang="en">Define where we want our output to go. The Attribute, IntermediateDirectories, default MODULE, says that intermediate files will be local to the module, versus a unified directory structure.</xs:documentation>

@@ -1286,7 +1309,36 @@
             </xs:sequence>

         </xs:complexType>

     </xs:element>

-    <!-- PcdDynamicBuildDeclarations -->

+    <xs:element name="PcdDeclarations">

+        <xs:annotation>

+            <xs:documentation xml:lang="en">Child of Package Surface Area Description (SPD)</xs:documentation>

+            <xs:documentation xml:lang="en">This permits entering information about a package's PCD information</xs:documentation>

+        </xs:annotation>

+        <xs:complexType>

+            <xs:sequence minOccurs="1">

+                <xs:element maxOccurs="unbounded" name="PcdEntry">

+                    <xs:annotation>

+                        <xs:documentation xml:lang="en">This is the valid content of the PCD table of a Module. The contents may not be wired at build time, and these only refer to Platform Build values, not modules.</xs:documentation>

+                        <xs:documentation xml:lang="en">This element is valid for PcdInfo.xml and FPD files.</xs:documentation>

+                        <xs:documentation xml:lang="en">There is ONE required Attribute, ItemType</xs:documentation>

+                    </xs:annotation>

+                    <xs:complexType>

+                        <xs:sequence>

+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>

+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="Token"/>

+                            <xs:element minOccurs="1" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>

+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>

+                            <xs:element minOccurs="1" maxOccurs="1" name="ValidUsage" type="PcdListType"/>

+                            <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValue"/>

+                            <xs:element minOccurs="1" maxOccurs="1" name="HelpText" type="Paragraph"/>

+                        </xs:sequence>

+                        <xs:attributeGroup ref="PcdAttributes"/>

+                    </xs:complexType>

+                </xs:element>

+            </xs:sequence>

+        </xs:complexType>

+    </xs:element>

+    <!-- DO NOT USE removing PcdDefinitions, use PcdDeclarations for SPD entries  Use PcdBuildDeclarations for MSA Entires and PcdDynamicBuildDeclarations for FPD Entries -->

     <xs:element name="PcdDefinitions">

         <xs:annotation>

             <xs:documentation xml:lang="en">Child of Package Surface Area Description (SPD)</xs:documentation>

@@ -1478,6 +1530,7 @@
                         </xs:simpleContent>

                     </xs:complexType>

                 </xs:element>

+                <!-- DO NOT USE! removing Arch element, use Arch attribute of Protocol or ProtocolNotify instead. -->

                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">

                     <xs:complexType>

                         <xs:sequence>

@@ -1557,6 +1610,7 @@
         <xs:complexType>

             <xs:sequence minOccurs="1">

                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="Filename"/>

+                <!-- DO NOT USE! removing Arch element, use Arch Attribute of Filename instead.  -->

                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">

                     <xs:complexType>

                         <xs:sequence minOccurs="1">

diff --git a/Tools/XMLSchema/FrameworkDataTypes.xsd b/Tools/XMLSchema/FrameworkDataTypes.xsd
index 1eb27449ed..8199df0f6a 100644
--- a/Tools/XMLSchema/FrameworkDataTypes.xsd
+++ b/Tools/XMLSchema/FrameworkDataTypes.xsd
@@ -16,6 +16,12 @@
         <xs:documentation xml:lang="en">This schema defines EFI and Framework Data Types. Only simpleType are specified in this file. </xs:documentation>

     </xs:annotation>

     <xs:include schemaLocation="NamingConvention.xsd"/>

+    <xs:simpleType name="ArchList">

+        <xs:annotation>

+            <xs:documentation xml:lang="en">A list of one or more: IA32, X64, IPF and/or EBC</xs:documentation>

+        </xs:annotation>

+        <xs:list itemType="SupportedArchitectures"/>

+    </xs:simpleType>

     <xs:simpleType name="BlockNameType">

         <xs:annotation>

             <xs:documentation xml:lang="en">FIRMWARE: Define a block name to be BLOCK[A-F0-9]{2}</xs:documentation>

@@ -637,6 +643,9 @@
             </xs:enumeration>

         </xs:restriction>

     </xs:simpleType>

+    <xs:simpleType name="PcdListType">

+        <xs:list itemType="PcdItemTypes"/>

+    </xs:simpleType>

     <xs:simpleType name="PcdTypes">

         <xs:restriction base="NameConvention">

             <xs:enumeration value="FIXED_AT_BUILD">

@@ -644,6 +653,7 @@
                     <xs:documentation xml:lang="en">PCD Item is only a build time option and cannot be Dyanmic or Binary patched into the module.</xs:documentation>

                 </xs:annotation>

             </xs:enumeration>

+            <xs:enumeration value="FEATURE_FLAG"/>

             <xs:enumeration value="PATCHABLE_IN_MODULE">

                 <xs:annotation>

                     <xs:documentation xml:lang="en">PCD Item is set to a default value at build time and a binary of the module can be patched to update the value.</xs:documentation>