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 @@
+
+
+
+
+ This schema defines EFI and Framework Attribute. Only attributeGroups are specified in this file.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ These attributes are for the Pcds listed in PcdData, PcdEntry and/or PcdBuildData entries.
+ PcdUsage is only valid for PcdItemTypes = FEATURE_FLAG
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Attributes are either compressable and/or sequence order binding
+
+
+
+
+
+
+
+
+ Attributes for Sections, EncapsulationTag, EncapsulationType and OverrideID
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
Abstract is valid for all Description Files
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 @@
-->
- This schema defines EFI and Framework Attribute and Data Types. Only simpleType and attributeGroups are specified in this file.
+ This schema defines EFI and Framework Data Types. Only simpleType are specified in this file.
@@ -1023,175 +1023,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- These attributes are for the Pcds listed in PcdData, PcdEntry and/or PcdBuildData entries.
- PcdUsage is only valid for PcdItemTypes = FEATURE_FLAG
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Attributes are either compressable and/or sequence order binding
-
-
-
-
-
-
-
-
- Attributes for Sections, EncapsulationTag, EncapsulationType and OverrideID
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
This schema defines EFI and Framework Platform Data Elements that are specific to platform creation.
+
@@ -462,7 +463,7 @@
-
+
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 @@
+
+
+ Limit Polarity vaild values to -1, 0 and 1
+
+
+
+
+
This data type requires two or more words
@@ -296,14 +304,6 @@
-
-
- Define Zero as a vaild value
-
-
-
-
-
Definition of a Version Number, which can be any combination of a number followed by zero or more alphanumeric-dot-alphanumeric characters