updated several elements and re-organized the layout (moving Attributes to their own file, trying to cut down on the size of the files.)

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

5 files changed, 203 insertions, 181 deletions

diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
new file mode 100644
index 0000000000..63d88231f7
--- /dev/null
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2006/Edk2.0" targetNamespace="http://www.TianoCore.org/2006/Edk2.0">

+    <!--

+    Filename: FrameworkDataAttributes.xsd

+    

+    Copyright (c) 2006, Intel Corp.

+    All rights reserved. This program and the accompanying materials

+    are licensed and made available under the terms and conditions of the BSD License

+    which may be found at http://opensource.org/licenses/bsd-license.php

+    

+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+    

+  -->

+    <xs:annotation>

+        <xs:documentation xml:lang="en">This schema defines EFI and Framework Attribute. Only attributeGroups are specified in this file. </xs:documentation>

+    </xs:annotation>

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

+    <xs:include schemaLocation="FrameworkDataTypes.xsd"/>

+    <xs:attributeGroup name="BaseNameAttributes">

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

+        <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="BootModeName" type="BootModeNames" use="required"/>

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

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

+    </xs:attributeGroup>

+    <xs:attributeGroup name="ConvertAttributeString">

+        <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="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="Usage" type="EventUsage" use="optional"/>

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

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

+    </xs:attributeGroup>

+    <xs:attributeGroup name="ExternAttributes">

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

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

+    </xs:attributeGroup>

+    <xs:attributeGroup name="FormsetAttributes">

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

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

+        <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 default="true" name="EnableFeature" type="xs:boolean" use="optional"/>

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

+    </xs:attributeGroup>

+    <xs:attributeGroup name="HobAttributes">

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

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

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

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

+    </xs:attributeGroup>

+    <xs:attributeGroup name="LibraryAttributes">

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

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

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

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

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

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

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

+    </xs:attributeGroup>

+    <xs:attributeGroup name="ModuleNameAttributes">

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

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

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

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

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

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

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

+    </xs:attributeGroup>

+    <xs:attributeGroup name="OptionAttributes">

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

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

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

+    </xs:attributeGroup>

+    <xs:attributeGroup name="PackageAttributes">

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

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

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

+    </xs:attributeGroup>

+    <xs:attributeGroup name="PackageNameAttributes">

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

+        <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:annotation>

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

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

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

+    </xs:attributeGroup>

+    <xs:attributeGroup name="PlatformAttributes">

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

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

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

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

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

+        <xs:attribute name="PlatformVersion" type="xs:string" 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 default="true" name="EnableFeature" type="xs:boolean" use="optional"/>

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

+        <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 default="true" name="EnableFeature" type="xs:boolean" use="optional"/>

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

+        <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 default="true" name="EnableFeature" type="xs:boolean" use="optional"/>

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

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

+    </xs:attributeGroup>

+    <xs:attributeGroup name="ProtocolNotifyAttributes">

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

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

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

+    </xs:attributeGroup>

+    <xs:attributeGroup name="SectionsAttributes">

+        <xs:annotation>

+            <xs:documentation xml:lang="en">Attributes for Sections, EncapsulationTag, EncapsulationType and OverrideID</xs:documentation>

+        </xs:annotation>

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

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

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

+    </xs:attributeGroup>

+    <xs:attributeGroup name="SystemTableAttributes">

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

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

+    </xs:attributeGroup>

+    <xs:attributeGroup name="VariableAttributes">

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

+        <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:schema>

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index f02ec12d67..1d34b49e13 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -17,6 +17,7 @@
   </xs:annotation>

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

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

+  <xs:include schemaLocation="FrameworkDataAttributes.xsd"/>

   <xs:element name="Abstract">

     <xs:annotation>

       <xs:documentation xml:lang="en">Abstract is valid for all Description Files</xs:documentation>

diff --git a/Tools/XMLSchema/FrameworkDataTypes.xsd b/Tools/XMLSchema/FrameworkDataTypes.xsd
index 31bd87ea1d..38e16395fd 100644
--- a/Tools/XMLSchema/FrameworkDataTypes.xsd
+++ b/Tools/XMLSchema/FrameworkDataTypes.xsd
@@ -13,7 +13,7 @@
     

   -->

     <xs:annotation>

-        <xs:documentation xml:lang="en">This schema defines EFI and Framework Attribute and Data Types. Only simpleType and attributeGroups are specified in this file. </xs:documentation>

+        <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="BlockNameType">

@@ -1023,175 +1023,4 @@
             <xs:element name="ToolArgs" type="xs:string"/>

         </xs:sequence>

     </xs:complexType>

-    <xs:attributeGroup name="BaseNameAttributes">

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

-        <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="BootModeName" type="BootModeNames" use="required"/>

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

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

-    </xs:attributeGroup>

-    <xs:attributeGroup name="ConvertAttributeString">

-        <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="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="Usage" type="EventUsage" use="optional"/>

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

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

-    </xs:attributeGroup>

-    <xs:attributeGroup name="ExternAttributes">

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

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

-    </xs:attributeGroup>

-    <xs:attributeGroup name="FormsetAttributes">

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

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

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

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

-    </xs:attributeGroup>

-    <xs:attributeGroup name="HobAttributes">

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

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

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

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

-    </xs:attributeGroup>

-    <xs:attributeGroup name="LibraryAttributes">

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

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

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

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

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

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

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

-    </xs:attributeGroup>

-    <xs:attributeGroup name="ModuleNameAttributes">

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

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

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

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

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

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

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

-    </xs:attributeGroup>

-    <xs:attributeGroup name="OptionAttributes">

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

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

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

-    </xs:attributeGroup>

-    <xs:attributeGroup name="PackageAttributes">

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

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

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

-    </xs:attributeGroup>

-    <xs:attributeGroup name="PackageNameAttributes">

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

-        <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:annotation>

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

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

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

-    </xs:attributeGroup>

-    <xs:attributeGroup name="PlatformAttributes">

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

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

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

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

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

-        <xs:attribute name="PlatformVersion" type="xs:string" 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 default="true" name="EnableFeature" type="xs:boolean" use="optional"/>

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

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

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

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

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

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

-    </xs:attributeGroup>

-    <xs:attributeGroup name="ProtocolNotifyAttributes">

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

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

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

-    </xs:attributeGroup>

-    <xs:attributeGroup name="SectionsAttributes">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">Attributes for Sections, EncapsulationTag, EncapsulationType and OverrideID</xs:documentation>

-        </xs:annotation>

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

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

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

-    </xs:attributeGroup>

-    <xs:attributeGroup name="SystemTableAttributes">

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

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

-    </xs:attributeGroup>

-    <xs:attributeGroup name="VariableAttributes">

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

-        <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:schema>

diff --git a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
index f4c56843c9..348dd0deac 100644
--- a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
@@ -16,6 +16,7 @@
         <xs:documentation xml:lang="en"> This schema defines EFI and Framework Platform Data Elements that are specific to platform creation.</xs:documentation>

     </xs:annotation>

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

+    <xs:include schemaLocation="FrameworkDataAttributes.xsd"/>

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

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

     <xs:element name="Capsule">

@@ -462,7 +463,7 @@
         <xs:attribute name="Name" type="xs:string" use="required"/>

         <xs:attribute name="Size" type="HexAddressType" use="required"/>

         <xs:attribute name="BaseAddress" type="HexAddressType" use="required"/>

-        <xs:attribute name="ErasePolarity" type="ZeroOrOne" use="required"/>

+        <xs:attribute name="ErasePolarity" type="Polarity" use="required"/>

     </xs:attributeGroup>

     <xs:attributeGroup name="RawDataAttributes">

         <xs:attribute name="Name" type="xs:string" use="required"/>

diff --git a/Tools/XMLSchema/NamingConvention.xsd b/Tools/XMLSchema/NamingConvention.xsd
index 3faf1b923d..b44a37e539 100644
--- a/Tools/XMLSchema/NamingConvention.xsd
+++ b/Tools/XMLSchema/NamingConvention.xsd
@@ -174,6 +174,14 @@
             <xs:pattern value="(([a-zA-Z][a-zA-Z0-9]*)(_)*(.)*)+"/>

         </xs:restriction>

     </xs:simpleType>

+    <xs:simpleType name="Polarity">

+        <xs:annotation>

+            <xs:documentation xml:lang="en">Limit Polarity vaild values to -1, 0 and 1</xs:documentation>

+        </xs:annotation>

+        <xs:restriction base="xs:int">

+            <xs:pattern value="-1|0|1"/>

+        </xs:restriction>

+    </xs:simpleType>

     <xs:simpleType name="Sentence">

         <xs:annotation>

             <xs:documentation xml:lang="en"> This data type requires two or more words </xs:documentation>

@@ -296,14 +304,6 @@
             <xs:pattern value="0"/>

         </xs:restriction>

     </xs:simpleType>

-    <xs:simpleType name="ZeroOrOne">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">Define Zero as a vaild value</xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:int">

-            <xs:pattern value="0|1"/>

-        </xs:restriction>

-    </xs:simpleType>

     <xs:simpleType name="OldVersionDataType">

         <xs:annotation>

             <xs:documentation xml:lang="en"> Definition of a Version Number, which can be any combination of a number followed by zero or more alphanumeric-dot-alphanumeric characters </xs:documentation>