1) Move almost new schema related to PCD on branch to transition scheme in main trunk.

2) Remove the original unused PCD schema in FPD in main trunk.
2) Modify PCD tools to support updated schema in main trunk.

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

6 files changed, 530 insertions, 736 deletions

diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
index 92f320bc35..f9de63fc0d 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
@@ -1530,7 +1530,11 @@ public class CollectPCDAction {
                 pcdType      = Token.getpcdTypeFromString(pcdBuildData.getItemType().toString());

                 datumType    = Token.getdatumTypeFromString(pcdBuildData.getDatumType().toString());

                 tokenNumber  = Integer.decode(pcdBuildData.getToken().toString());

-                datum        = pcdBuildData.getValue();

+                if (pcdBuildData.getValue() != null) {

+                    datum = pcdBuildData.getValue().toString();

+                } else {

+                    datum = null;

+                }

                 maxDatumSize = pcdBuildData.getMaxDatumSize();

 

                 if ((pcdType    == Token.PCD_TYPE.FEATURE_FLAG) &&

@@ -2128,6 +2132,7 @@ public class CollectPCDAction {
         boolean             hasSkuId0       = false;

         Token.PCD_TYPE      pcdType         = Token.PCD_TYPE.UNKNOWN;

         int                 tokenNumber     = 0;

+        String              hiiDefaultValue = null;

 

         List<DynamicPcdBuildDefinitions.PcdBuildData.SkuInfo>   skuInfoList = null;

         DynamicPcdBuildDefinitions.PcdBuildData                 dynamicInfo = null;

@@ -2198,10 +2203,10 @@ public class CollectPCDAction {
             // Judge whether is DefaultGroup at first, because most case is DefautlGroup.

             // 

             if (skuInfoList.get(index).getValue() != null) {

-                skuInstance.value.setValue(skuInfoList.get(index).getValue());

+                skuInstance.value.setValue(skuInfoList.get(index).getValue().toString());

                 if ((exceptionString = verifyDatum(token.cName, 

                                                    null, 

-                                                   skuInfoList.get(index).getValue(), 

+                                                   skuInfoList.get(index).getValue().toString(), 

                                                    token.datumType, 

                                                    token.datumSize)) != null) {

                     throw new EntityException(exceptionString);

@@ -2215,7 +2220,7 @@ public class CollectPCDAction {
                 // 

                 if (datum != null) {

                     if ((skuInstance.id == 0)                                   &&

-                        !datum.equalsIgnoreCase(skuInfoList.get(index).getValue())) {

+                        !datum.toString().equalsIgnoreCase(skuInfoList.get(index).getValue().toString())) {

                         exceptionString = "[FPD file error] For dynamic PCD " + token.cName + ", the value in module " + moduleName + " is " + datum.toString() + " but the "+

                                           "value of sku 0 data in <DynamicPcdBuildDefinition> is " + skuInstance.value.value + ". They are must be same!"+

                                           " or you could not define value for a dynamic PCD in every <ModuleSA>!"; 

@@ -2255,10 +2260,16 @@ public class CollectPCDAction {
                 if (exceptionString != null) {

                     throw new EntityException(exceptionString);

                 }

+                

+                if (skuInfoList.get(index).getHiiDefaultValue() != null) {

+                    hiiDefaultValue = skuInfoList.get(index).getHiiDefaultValue().toString();

+                } else {

+                    hiiDefaultValue = null;

+                }

 

                 if ((exceptionString = verifyDatum(token.cName, 

                                                    null, 

-                                                   skuInfoList.get(index).getHiiDefaultValue(), 

+                                                   hiiDefaultValue, 

                                                    token.datumType, 

                                                    token.datumSize)) != null) {

                     throw new EntityException(exceptionString);

@@ -2275,7 +2286,7 @@ public class CollectPCDAction {
                 skuInstance.value.setHiiData(skuInfoList.get(index).getVariableName(),

                                              translateSchemaStringToUUID(skuInfoList.get(index).getVariableGuid().toString()),

                                              skuInfoList.get(index).getVariableOffset(),

-                                             skuInfoList.get(index).getHiiDefaultValue());

+                                             skuInfoList.get(index).getHiiDefaultValue().toString());

                 token.skuData.add(skuInstance);

                 continue;

             }

diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
index b08c8b7b86..288d12f309 100644
--- a/Tools/XMLSchema/FrameworkDataAttributes.xsd
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -385,10 +385,20 @@
         <!-- DO NOT USE remove OverrideID from use -->

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

     </xs:attributeGroup>

+    <xs:attributeGroup name="DynamicBuildPcdAttributes">

+      <xs:annotation>

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

+      </xs:annotation>

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

+    </xs:attributeGroup>

     <xs:attributeGroup name="PcdBuildDefinitionAttributes">

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

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

     </xs:attributeGroup>

+    <xs:attributeGroup name="PcdCodedAttributes">

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

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

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

+    </xs:attributeGroup>    

     <xs:attributeGroup name="PcdDeclarationAttributes">

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

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

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 8e00b70ea6..5d9966d740 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -1177,230 +1177,6 @@
             </xs:simpleContent>

         </xs:complexType>

     </xs:element>

-    <xs:element name="PcdBuildDeclarations">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">NEW: Will become a child of ModuleSA in the FPD</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:choice minOccurs="1">

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

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

-                    <xs:annotation>

-                        <xs:documentation xml:lang="en">Child of PcdBuildDeclarations</xs:documentation>

-                        <xs:documentation xml:lang="en">This is date element is used in the platform build description file and contains valid data for a Platform Build</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">

-                                <xs:annotation>

-                                    <xs:documentation xml:lang="en">This as a unique identifier defined for either this name space.</xs:documentation>

-                                    <xs:documentation xml:lang="en">The Target Attribute may be used to define a Target name space, such as PCI.</xs:documentation>

-                                </xs:annotation>

-                                <xs:complexType>

-                                    <xs:simpleContent>

-                                        <xs:extension base="HexDoubleWordDataType">

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

-                                        </xs:extension>

-                                    </xs:simpleContent>

-                                </xs:complexType>

-                            </xs:element>

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

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

-                                <xs:annotation>

-                                    <xs:documentation xml:lang="en">This specifies the size of the Pcd Datum. It is either 8, 16, 32 or 64 bits for values, 1 bit for BOOLEAN and variable length for elements defined as VOID*</xs:documentation>

-                                </xs:annotation>

-                            </xs:element>

-                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="HiiEnable" type="xs:boolean">

-                                <xs:annotation>

-                                    <xs:documentation xml:lang="en">This Bit means that the Variable data is associated with HII</xs:documentation>

-                                </xs:annotation>

-                            </xs:element>

-                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="VpdEnable" type="xs:boolean">

-                                <xs:annotation>

-                                    <xs:documentation xml:lang="en">This bit enables the Vital Product Data area within flash for maintaining PCD information</xs:documentation>

-                                </xs:annotation>

-                            </xs:element>

-                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="AlternateNameSpaceEnable" type="xs:boolean">

-                                <xs:annotation>

-                                    <xs:documentation>This is only applicable to ItemType DYNAMIC_EX</xs:documentation>

-                                </xs:annotation>

-                            </xs:element>

-                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuEnable" type="xs:boolean"/>

-                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>

-                            <xs:choice minOccurs="0">

-                                <xs:element minOccurs="0" maxOccurs="1" name="SkuDataArray">

-                                    <xs:annotation>

-                                        <xs:documentation xml:lang="en">This element is a list of two entries per line, the first should be an integer, while the second entry should be a string value</xs:documentation>

-                                    </xs:annotation>

-                                    <xs:simpleType>

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

-                                    </xs:simpleType>

-                                </xs:element>

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

-                                    <xs:annotation>

-                                        <xs:documentation xml:lang="en">This section is for a list of SkuData Elements, ID and Value</xs:documentation>

-                                    </xs:annotation>

-                                    <xs:complexType>

-                                        <xs:sequence minOccurs="1">

-                                            <xs:element name="Id" type="xs:int"/>

-                                            <xs:element name="Value" type="xs:normalizedString"/>

-                                        </xs:sequence>

-                                    </xs:complexType>

-                                </xs:element>

-                            </xs:choice>

-                            <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="MaxSku" type="HexByteDataType">

-                                <xs:annotation>

-                                    <xs:documentation xml:lang="en">This value comes from a production line database, and has nothing to do with the number of SkuData IDs that have been defined.</xs:documentation>

-                                </xs:annotation>

-                            </xs:element>

-                            <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="SkuId" type="HexByteDataType">

-                                <xs:annotation>

-                                    <xs:documentation xml:lang="en">This is the specific Sku ID for this build.</xs:documentation>

-                                </xs:annotation>

-                            </xs:element>

-                            <xs:element minOccurs="1" maxOccurs="1" name="DatumSize">

-                                <xs:annotation>

-                                    <xs:documentation xml:lang="en">Max Number of Bytes of the data.</xs:documentation>

-                                </xs:annotation>

-                                <xs:simpleType>

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

-                                        <xs:minInclusive value="1"/>

-                                        <xs:maxInclusive value="16777215"/>

-                                    </xs:restriction>

-                                </xs:simpleType>

-                            </xs:element>

-                            <xs:element minOccurs="1" maxOccurs="1" name="VariableGuid" type="VariableGuidType">

-                                <xs:annotation>

-                                    <xs:documentation xml:lang="en">This is the Variable's GUID if and only if HII is enabled.</xs:documentation>

-                                </xs:annotation>

-                            </xs:element>

-                            <xs:element minOccurs="1" maxOccurs="1" name="VariableName" type="xs:normalizedString">

-                                <xs:annotation>

-                                    <xs:documentation xml:lang="en">This is the C Name for the Variable, and is valid if and only HII is enabled.</xs:documentation>

-                                </xs:annotation>

-                            </xs:element>

-                            <xs:element minOccurs="0" maxOccurs="1" name="VariableValueDefault" type="xs:normalizedString"/>

-                            <xs:element minOccurs="1" maxOccurs="1" name="DataOffset" type="Hex64BitDataType">

-                                <xs:annotation>

-                                    <xs:documentation xml:lang="en">If HII is enabled, This is the offset into the variable data entry, If Vpd is enabled, then it's the Offset into the VPD area of the image defined by platform manufacturer, if neither HII nor Vpd are enabled, it's the offset into the PCD Data Area. HII and VPD can never be enabled at the same time (as of the date of this document.)</xs:documentation>

-                                </xs:annotation>

-                            </xs:element>

-                            <xs:element minOccurs="0" maxOccurs="1" name="GuidOffset" type="Hex64BitDataType">

-                                <xs:annotation>

-                                    <xs:documentation xml:lang="en">FIELD IS NOT USED! REMOVE in FINAL!</xs:documentation>

-                                </xs:annotation>

-                            </xs:element>

-                            <xs:element minOccurs="1" maxOccurs="1" name="DefaultValue" type="xs:normalizedString"/>

-                        </xs:sequence>

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

-                        <xs:attribute name="PcdIsDriver">

-                            <xs:simpleType>

-                                <xs:annotation>

-                                    <xs:documentation xml:lang="en">This is an enumerated data type that will be used for DYNAMIC_EX, PEIM or DXE only</xs:documentation>

-                                </xs:annotation>

-                                <xs:restriction base="UCNameType">

-                                    <xs:enumeration value="PEI_PCD_DRIVER"/>

-                                    <xs:enumeration value="DXE_PCD_DRIVER"/>

-                                </xs:restriction>

-                            </xs:simpleType>

-                        </xs:attribute>

-                    </xs:complexType>

-                </xs:element>

-            </xs:choice>

-        </xs:complexType>

-    </xs:element>

-    <!-- PcdBuildDeclarations -->

-    <xs:element name="PcdDynamicBuildDeclarations">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">Child of Framework Platform Description (FPD)</xs:documentation>

-            <xs:documentation xml:lang="en">We permit the FPD to use an external XML file for PCD information or else the information must be contained within the XML data element, PcdBuildData.</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:sequence>

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

-                    <xs:annotation>

-                        <xs:documentation xml:lang="en">Child of PcdBuildDeclarations</xs:documentation>

-                        <xs:documentation xml:lang="en">This is date element is used in the platform build description file and contains valid data for a Platform Build</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="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>

-                            <xs:element minOccurs="1" maxOccurs="1" name="Token">

-                                <xs:annotation>

-                                    <xs:documentation xml:lang="en">This as a unique identifier defined for either this name space.</xs:documentation>

-                                    <xs:documentation xml:lang="en">The Target Attribute may be used to define a Target name space, such as PCI.</xs:documentation>

-                                </xs:annotation>

-                                <xs:complexType>

-                                    <xs:simpleContent>

-                                        <xs:extension base="HexDoubleWordDataType">

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

-                                        </xs:extension>

-                                    </xs:simpleContent>

-                                </xs:complexType>

-                            </xs:element>

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

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

-                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="HiiEnable" type="xs:boolean"/>

-                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="VpdEnable" type="xs:boolean"/>

-                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="AlternateNameSpaceEnable" type="xs:boolean"/>

-                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuEnable" type="xs:boolean"/>

-                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>

-                            <xs:choice minOccurs="0">

-                                <xs:element minOccurs="0" maxOccurs="1" name="SkuDataArray">

-                                    <xs:annotation>

-                                        <xs:documentation xml:lang="en">This element is a list of two entries per line, the first should be an integer, while the second entry should be a string value</xs:documentation>

-                                    </xs:annotation>

-                                    <xs:simpleType>

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

-                                    </xs:simpleType>

-                                </xs:element>

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

-                                    <xs:annotation>

-                                        <xs:documentation xml:lang="en">This section is for a list of SkuData Elements, ID and Value</xs:documentation>

-                                    </xs:annotation>

-                                    <xs:complexType>

-                                        <xs:sequence minOccurs="1">

-                                            <xs:element name="Id" type="xs:int"/>

-                                            <xs:element name="Value" type="xs:normalizedString"/>

-                                        </xs:sequence>

-                                    </xs:complexType>

-                                </xs:element>

-                            </xs:choice>

-                            <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="MaxSku" type="HexByteDataType">

-                                <xs:annotation>

-                                    <xs:documentation xml:lang="en">This value comes from a production line database, and has nothing to do with the number of SkuData IDs that have been defined.</xs:documentation>

-                                </xs:annotation>

-                            </xs:element>

-                            <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="SkuId" type="HexByteDataType"/>

-                            <xs:element minOccurs="1" maxOccurs="1" name="DatumSize" type="DatumSizeLimitation"/>

-                            <xs:element minOccurs="1" maxOccurs="1" name="VariableGuid" type="VariableGuidType"/>

-                            <xs:element minOccurs="1" maxOccurs="1" name="VariableName" type="xs:normalizedString"/>

-                            <xs:element minOccurs="0" maxOccurs="1" name="VariableValueDefault" type="xs:normalizedString"/>

-                            <xs:element minOccurs="1" maxOccurs="1" name="DataOffset" type="Hex64BitDataType"/>

-                            <xs:element minOccurs="0" maxOccurs="1" name="GuidOffset" type="Hex64BitDataType"/>

-                            <xs:element minOccurs="1" maxOccurs="1" name="DefaultValue" type="xs:normalizedString"/>

-                        </xs:sequence>

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

-                        <xs:attribute name="PcdIsDriver">

-                            <xs:simpleType>

-                                <xs:annotation>

-                                    <xs:documentation xml:lang="en">This is an enumerated data type that will be used for DYNAMIC_EX, PEIM or DXE only</xs:documentation>

-                                </xs:annotation>

-                                <xs:restriction base="UCNameType">

-                                    <xs:enumeration value="PEI_PCD_DRIVER"/>

-                                    <xs:enumeration value="DXE_PCD_DRIVER"/>

-                                </xs:restriction>

-                            </xs:simpleType>

-                        </xs:attribute>

-                    </xs:complexType>

-                </xs:element>

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

     <xs:element name="DynamicPcdBuildDefinitions">

         <xs:annotation>

             <xs:documentation xml:lang="en">Child of Framework Platform Description (FPD)</xs:documentation>

@@ -1408,10 +1184,10 @@
         </xs:annotation>

         <xs:complexType>

             <xs:sequence>

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

+                <xs:element minOccurs="1" maxOccurs="unbounded" name="PcdBuildData">

                     <xs:complexType>

                         <xs:sequence>

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

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

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

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

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

@@ -1429,7 +1205,7 @@
                                 </xs:complexType>

                             </xs:element>

                         </xs:sequence>

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

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

                     </xs:complexType>

                 </xs:element>

             </xs:sequence>

@@ -1440,16 +1216,17 @@
             <xs:documentation xml:lang="en">Child of FPD ModuleSA element for FIXED_AT_BUILD, PATCHABLE_IN_MODULE, and FEATURE_FLAG PCDS Only!</xs:documentation>

         </xs:annotation>

         <xs:complexType>

-            <xs:sequence minOccurs="1">

-                <xs:element maxOccurs="unbounded" name="PcdData">

+            <xs:sequence>

+                <xs:element minOccurs="1" maxOccurs="unbounded" name="PcdData">

                     <xs:complexType>

                         <xs:sequence>

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

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

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

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

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

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

+                            <!-- MaxDatumSize is only required if the DatumType is VOID* -->

                             <xs:element minOccurs="0" maxOccurs="1" name="MaxDatumSize" type="DatumSizeLimitation"/>                            

-                            <xs:element minOccurs="0" maxOccurs="1" name="Value" type="xs:normalizedString"/>

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

                         </xs:sequence>

                         <xs:attributeGroup ref="PcdBuildDefinitionAttributes"/>

                     </xs:complexType>

@@ -1459,7 +1236,7 @@
     </xs:element>

     <xs:group name="DefaultGroup">

         <xs:sequence>

-            <xs:element minOccurs="1" maxOccurs="1" name="Value" type="xs:normalizedString"/>

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

         </xs:sequence>

     </xs:group>

     <xs:group name="HiiEnable">

@@ -1467,10 +1244,10 @@
             <xs:documentation xml:lang="en">If HiiEnable group is specified, then HiiEnable is default true</xs:documentation>

         </xs:annotation>

         <xs:sequence>

-            <xs:element minOccurs="0" maxOccurs="1" name="VariableName" type="VariableNameDataType"/>

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

             <xs:element minOccurs="0" maxOccurs="1" name="VariableGuid" type="VariableGuidType"/>

-            <xs:element minOccurs="0" maxOccurs="1" name="VariableOffset" type="Hex64BitDataType"/>

-            <xs:element minOccurs="0" maxOccurs="1" name="HiiDefaultValue" type="xs:normalizedString"/>

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

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

         </xs:sequence>

     </xs:group>

     <xs:group name="VpdEnable">

@@ -1478,7 +1255,7 @@
             <xs:documentation xml:lang="en">If VpdEnable group is specified, then VpdEnable is default true</xs:documentation>

         </xs:annotation>

         <xs:sequence>

-            <xs:element minOccurs="0" maxOccurs="1" name="VpdOffset" type="Hex64BitDataType"/>

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

         </xs:sequence>

     </xs:group>

     <xs:element name="PcdCoded">

@@ -1486,20 +1263,20 @@
             <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:sequence>

+                <xs:element minOccurs="1" 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" ref="HelpText"/>

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

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

+                            <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:attributeGroup ref="PcdCodedAttributes"/>

                     </xs:complexType>

                 </xs:element>

             </xs:sequence>

@@ -1516,13 +1293,13 @@
                 <xs:element maxOccurs="unbounded" name="PcdEntry">

                     <xs:complexType>

                         <xs:sequence>

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

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

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

                             <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" ref="HelpText"/>

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

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

                         </xs:sequence>

                         <xs:attributeGroup ref="PcdDeclarationAttributes"/>

                     </xs:complexType>

@@ -1572,7 +1349,7 @@
                             <xs:element minOccurs="0" maxOccurs="1" name="VariableGuid" type="VariableGuidType"/>

                             <xs:element minOccurs="0" maxOccurs="1" name="DataOffset" type="Hex64BitDataType"/>

                             <xs:element default="0" minOccurs="0" maxOccurs="1" name="GuidOffset" type="Hex64BitDataType"/>

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

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

                         </xs:sequence>

                         <xs:attributeGroup ref="PcdAttributes"/>

                     </xs:complexType>

diff --git a/Tools/XMLSchema/FrameworkDataTypes.xsd b/Tools/XMLSchema/FrameworkDataTypes.xsd
index b99fd2b495..7cf160294a 100644
--- a/Tools/XMLSchema/FrameworkDataTypes.xsd
+++ b/Tools/XMLSchema/FrameworkDataTypes.xsd
@@ -114,9 +114,9 @@
             <xs:maxInclusive value="16777215"/>

         </xs:restriction>

     </xs:simpleType>

-    <xs:simpleType name="DefaultValue">

-        <xs:union memberTypes="xs:normalizedString xs:int UnicodeString"/>

-    </xs:simpleType>

+    <xs:simpleType name="DefaultValueType">

+      <xs:union memberTypes="xs:normalizedString Hex64BitDataType UnicodeString HexByteArrayType"/>

+    </xs:simpleType>    

     <xs:simpleType name="EfiSectionType">

         <xs:restriction base="UCNameType">

             <xs:enumeration value="EFI_SECTION_FREEFORM_SUBTYPE_GUID"/>

@@ -262,6 +262,14 @@
             <xs:enumeration value="PRIVATE"/>

         </xs:restriction>

     </xs:simpleType>

+    <xs:simpleType name="HexByteArrayType">

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

+    </xs:simpleType>

+    <xs:simpleType name="HexByteArrayListType">

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

+        <xs:pattern value="((( )?0x[a-fA-F0-9]{2})(,)?)+( )?"/>

+      </xs:restriction>

+    </xs:simpleType>

     <xs:simpleType name="HexWordArrayType">

       <xs:restriction base="xs:normalizedString">

          <xs:pattern value="((( )?0x[a-fA-F0-9]{4})(,)?)+( )?"/>

diff --git a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
index 3fb6b07af7..234535901f 100644
--- a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
@@ -1,471 +1,466 @@
-<?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: FrameworkPlatformDataElements.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 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:include schemaLocation="FrameworkPlatformDataTypes.xsd"/>

-    <xs:element name="Capsule">

-        <xs:complexType>

-            <xs:sequence>

-                <xs:element minOccurs="1" maxOccurs="1" name="CapsuleId" type="xs:string"/>

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

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

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="CapsuleAttributes">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">This element is used specify different name value pairs.</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:sequence>

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

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

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

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="CapsuleOptions">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">This element is used specify different name value pairs.</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:sequence>

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

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

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

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="Capsules">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">Permit multiple Capsule Sections</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:sequence minOccurs="1" maxOccurs="unbounded">

-                <xs:element ref="Capsule"/>

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="Disable" type="xs:string"/>

-    <xs:element name="Enable" type="xs:string"/>

-    <xs:element name="Flash">

-        <xs:complexType>

-            <xs:annotation>

-                <xs:documentation xml:lang="en">We allow specifying the Flash layout in this directory, or we allow specifying a flashmap filename</xs:documentation>

-            </xs:annotation>

-            <xs:sequence>

-                <xs:choice>

-                    <xs:element name="FlashDefinition" type="FlashData"/>

-                    <xs:element name="FlashDefinitionFile" type="FileNameConvention"/>

-                </xs:choice>

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

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

-            </xs:sequence>

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

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="FlashDeviceImage">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">Define contents of the regions in flash. The files and data are placed in the output image in the order they are encountered in this definition. Multiple FlashDeviceImage sections may be defined. Which one the tool should use is specified by Name on the command line.</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:all>

-                <xs:element minOccurs="0" maxOccurs="1" name="RawData">

-                    <xs:complexType>

-                        <xs:sequence minOccurs="0" maxOccurs="1">

-                            <xs:element name="Data" type="xs:string"/>

-                        </xs:sequence>

-                        <xs:attributeGroup ref="RawDataAttributes"/>

-                    </xs:complexType>

-                </xs:element>

-                <xs:element minOccurs="0" maxOccurs="1" name="File">

-                    <xs:complexType>

-                        <xs:attributeGroup ref="FlashDeviceImageFileAttributes"/>

-                    </xs:complexType>

-                </xs:element>

-            </xs:all>

-            <xs:attributeGroup ref="FlashDeviceImageAttributes"/>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="FlashDeviceInfo">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">This is the Flash Devcie definition List</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:sequence>

-                <xs:element name="Blocks">

-                    <xs:complexType>

-                        <xs:sequence>

-                            <xs:element minOccurs="1" maxOccurs="255" name="Block">

-                                <xs:complexType>

-                                    <xs:simpleContent>

-                                        <xs:extension base="BlockNameType">

-                                            <xs:attributeGroup ref="BlockAttributes"/>

-                                        </xs:extension>

-                                    </xs:simpleContent>

-                                </xs:complexType>

-                            </xs:element>

-                        </xs:sequence>

-                    </xs:complexType>

-                </xs:element>

-                <xs:element name="Regions">

-                    <xs:complexType>

-                        <xs:sequence>

-                            <xs:element minOccurs="1" maxOccurs="unbounded" name="Region">

-                                <xs:complexType>

-                                    <xs:all>

-                                        <xs:element name="SubRegions">

-                                            <xs:complexType>

-                                                <xs:sequence minOccurs="0" maxOccurs="unbounded">

-                                                    <xs:element name="SubRegion">

-                                                        <xs:complexType>

-                                                            <xs:simpleContent>

-                                                                <xs:extension base="xs:string">

-                                                                    <xs:attributeGroup ref="SubRegionAttributes"/>

-                                                                </xs:extension>

-                                                            </xs:simpleContent>

-                                                        </xs:complexType>

-                                                    </xs:element>

-                                                </xs:sequence>

-                                            </xs:complexType>

-                                        </xs:element>

-                                    </xs:all>

-                                    <xs:attributeGroup ref="RegionAttributes"/>

-                                </xs:complexType>

-                            </xs:element>

-                        </xs:sequence>

-                    </xs:complexType>

-                </xs:element>

-            </xs:sequence>

-            <xs:attributeGroup ref="FlashDeviceInfoAttributes"/>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="FlashDeviceOverrideImage">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">Define OVERRIDE contents of the regions in flash. Only what is different here from what may defined in other areas (or files) is needed </xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:sequence>

-                <xs:element minOccurs="0" maxOccurs="1" name="Name" type="NameConvention"/>

-                <xs:element minOccurs="0" maxOccurs="unbounded" name="File" type="FvImageOverrideFileType"/>

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="FlashDeviceOverrideInfo">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">This is the Flash Devcie Override Definition list. Only what is different from the previously defined stuff needs to be included.</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:sequence>

-                <xs:element minOccurs="0" maxOccurs="1" name="Name" type="UCNameType"/>

-                <xs:element default="512KB" minOccurs="0" maxOccurs="1" name="FlashSize" type="FlashSize"/>

-                <xs:element minOccurs="0" maxOccurs="1" name="BaseAddress" type="HexAddressType"/>

-                <xs:element minOccurs="0" maxOccurs="1" name="OutputDirectory" type="DirectoryNamingConvention"/>

-                <xs:element minOccurs="0" maxOccurs="1" name="MicrocodeFile" type="FileNameConvention"/>

-                <xs:element minOccurs="0" maxOccurs="255" name="Block" type="BlockNameType"/>

-                <xs:element minOccurs="0" maxOccurs="unbounded" name="Region" type="RegionDataType"/>

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="FvImage">

-        <xs:complexType>

-            <xs:sequence>

-                <xs:element minOccurs="1" maxOccurs="unbounded" ref="FvImageNames"/>

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

-            </xs:sequence>

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

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="FvImageName">

-        <xs:complexType>

-            <xs:sequence>

-                <xs:element ref="FvImageOptions"/>

-            </xs:sequence>

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

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="FvImageNames" type="xs:NCName"/>

-    <xs:element name="FvImageOptions">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">This element is used specify different name value pairs.</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:sequence>

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

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

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

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="FvImages">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">This section allows the user to define specific information regarding the FvImage</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:sequence>

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

-                <xs:choice>

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

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

-                </xs:choice>

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

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="FvRegionName">

-        <xs:complexType>

-            <xs:simpleContent>

-                <xs:extension base="KeywordType">

-                    <xs:attributeGroup ref="FvRegionNameAttributes"/>

-                </xs:extension>

-            </xs:simpleContent>

-        </xs:complexType>

-    </xs:element>    

-    <xs:element name="ModuleSA">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">This element is used to specify information in the Platform Description File.</xs:documentation>

-            <xs:documentation xml:lang="en">This is a mixed element, allowing the user to specify the name of the MSA file, as well as to optionally specify additional override information.</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:sequence minOccurs="1">

-                <!-- DO NOT USE! REMOVE SourceFiles in FINAL -->

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

-                <!-- DO NOT USE! REMOVE Includes in FINAL -->

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

-                <!-- Libraries stays in FINAL -->

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

-                <!-- DO NOT USE! REMOVE Protocols in FINAL -->

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

-                <!-- DO NOT USE! REMOVE Events in FINAL -->

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

-                <!-- DO NOT USE! REMOVE Hobs in FINAL -->

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

-                <!-- DO NOT USE! REMOVE PPIs in FINAL -->

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

-                <!-- DO NOT USE! REMOVE Variables in FINAL -->

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

-                <!-- DO NOT USE! REMOVE BootModes in FINAL -->

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

-                <!-- DO NOT USE! REMOVE SystemTables in FINAL -->

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

-                <!-- DO NOT USE! REMOVE DataHubs in FINAL -->

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

-                <!-- DO NOT USE! REMOVE Formsets in FINAL -->

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

-                <!-- DO NOT USE! REMOVE Guids in FINAL -->

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

-                <xs:choice minOccurs="0">

-                    <!-- DO NOT USE! REMOVE Externs stays in FINAL -->

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

-                    <xs:element minOccurs="0" maxOccurs="1" name="Extern">

-                        <xs:annotation>

-                            <xs:documentation xml:lang="en">Only specification is allow here. We need to let this be an addtion OR, if the WORD portion exists, this entry takes precedence.</xs:documentation>

-                        </xs:annotation>

-                        <xs:complexType>

-                            <xs:sequence>

-                                <xs:element minOccurs="1" maxOccurs="unbounded" ref="Specification"/>

-                            </xs:sequence>

-                        </xs:complexType>

-                    </xs:element>

-                </xs:choice>

-                <xs:element minOccurs="0" maxOccurs="unbounded" name="Specification" type="Sentence"/>

-                <xs:choice>

-                    <!-- DO NOT USE! REMOVE PcdBuildDeclarations in FINAL -->

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

-                    <!-- PcdBuildDefinition stays in FINAL -->

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

-                </xs:choice>

-                <!-- BuildOptions stays in FINAL -->

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

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

-            </xs:sequence>

-            <xs:attributeGroup ref="MsaAttributes"/>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="NameValue">

-        <xs:complexType>

-            <xs:simpleContent>

-                <xs:extension base="xs:string">

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

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

-                </xs:extension>

-            </xs:simpleContent>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="Overrides">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">DO NOT USE! - Removing this from Schema</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:sequence>

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

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

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="PlatformDescriptions">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">DO NOT USE! - Use PlatformList instead</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:sequence maxOccurs="unbounded">

-                <xs:element ref="Platform"/>

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="PlatformList">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">This is used in the Framework Database file</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:sequence maxOccurs="unbounded">

-                <xs:element ref="Platform"/>

-                <xs:element name="Filename" type="PathAndFilename" minOccurs="0" maxOccurs="unbounded"/>

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="FrameworkModules">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">This is used in a Framework Platform Description (FPD) file</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:sequence>

-                <xs:choice>

-                    <xs:sequence>

-                        <xs:element minOccurs="0" maxOccurs="1" name="SEC" type="Components"/>

-                        <xs:element minOccurs="0" maxOccurs="1" name="PEI_CORE" type="Components"/>

-                        <xs:element minOccurs="0" maxOccurs="1" name="PEIM" type="Components"/>

-                        <xs:element minOccurs="0" maxOccurs="1" name="DXE_CORE" type="Components"/>

-                        <xs:element minOccurs="0" maxOccurs="1" name="DXE_DRIVERS" type="Components"/>

-                        <xs:element minOccurs="0" maxOccurs="1" name="OTHER_COMPONENTS" type="Components"/>

-                    </xs:sequence>

-                    <xs:element minOccurs="1" maxOccurs="unbounded" ref="ModuleSA"/>

-                </xs:choice>

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="TianoImage">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">DO NOT USE - Use FrameworkModules Instead.</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:sequence>

-                <xs:element minOccurs="0" maxOccurs="1" name="SEC" type="Components"/>

-                <xs:element minOccurs="0" maxOccurs="1" name="PEI_CORE" type="Components"/>

-                <xs:element minOccurs="0" maxOccurs="1" name="PEIM" type="Components"/>

-                <xs:element minOccurs="0" maxOccurs="1" name="DXE_CORE" type="Components"/>

-                <xs:element minOccurs="0" maxOccurs="1" name="DXE_DRIVERS" type="Components"/>

-                <xs:element minOccurs="0" maxOccurs="1" name="OTHER_COMPONENTS" type="Components"/>

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="FlashDeviceDefinitions">

-        <xs:complexType>

-            <xs:annotation>

-                <xs:documentation xml:lang="en">We allow specifying the FlashMap filename</xs:documentation>

-            </xs:annotation>

-            <xs:sequence>

-                <xs:element minOccurs="0" maxOccurs="1" name="FlashDefinitionFile" type="PathAndFilename"/>

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

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="PlatformDefinitions">

-        <xs:complexType>

-            <xs:sequence>

-                <!-- This is the list of ALL architectures that are supported by this Platform -->

-                <xs:element minOccurs="1" maxOccurs="1" name="SupportedArchitectures" type="ArchListType"/>

-                <xs:element minOccurs="1" maxOccurs="1" name="BuildTargets" type="BuildTargetList"/>

-                <xs:element default="UNIFIED" name="IntermediateDirectories" type="IntermediateOutputType"/>

-                <xs:element minOccurs="0" maxOccurs="1" name="OutputDirectory" type="xs:anyURI"/>

-                <!-- SkuInfo is only defined if Sku enabled -->

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

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

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

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>    

-    <xs:complexType name="Components">

-        <xs:sequence minOccurs="1" maxOccurs="unbounded">

-            <xs:element ref="ModuleSA"/>

-        </xs:sequence>

-    </xs:complexType>

-    <xs:complexType name="FlashData">

-        <xs:sequence>

-            <xs:element minOccurs="0" maxOccurs="unbounded" name="UserDefinedFvRegion" type="NameConvention"/>

-            <xs:choice minOccurs="0" maxOccurs="1">

-                <xs:sequence>

-                    <xs:element minOccurs="1" maxOccurs="1" ref="FlashDeviceInfo"/>

-                    <xs:element minOccurs="1" maxOccurs="1" ref="FlashDeviceImage"/>

-                </xs:sequence>

-            </xs:choice>

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

-        </xs:sequence>

-    </xs:complexType>

-    <xs:complexType name="FvImageFileType">

-        <xs:sequence>

-            <xs:element minOccurs="1" maxOccurs="1" name="Name" type="FileNameConvention"/>

-            <xs:element minOccurs="1" maxOccurs="1" name="Region" type="FvRegionTypes"/>

-            <xs:element minOccurs="1" maxOccurs="unbounded" name="RawData" type="RawDataType"/>

-        </xs:sequence>

-    </xs:complexType>

-    <xs:complexType name="FvImageOverrideFileType">

-        <xs:sequence>

-            <xs:element minOccurs="0" maxOccurs="1" name="Name" type="FileNameConvention"/>

-            <xs:element minOccurs="0" maxOccurs="1" name="Region" type="FvRegionTypes"/>

-            <xs:element minOccurs="0" maxOccurs="1" name="UserDefinedFvRegion" type="NameConvention"/>

-            <xs:element minOccurs="0" maxOccurs="unbounded" name="RawData" type="RawDataType"/>

-        </xs:sequence>

-    </xs:complexType>

-    <xs:complexType name="RawDataType">

-        <xs:sequence>

-            <xs:element minOccurs="1" maxOccurs="1" name="Name" type="NameConvention"/>

-            <xs:element minOccurs="0" maxOccurs="1" name="Region" type="FvRegionTypes"/>

-            <xs:element minOccurs="0" maxOccurs="1" name="UserDefinedFvRegion" type="NameConvention"/>

-            <xs:element minOccurs="1" maxOccurs="1" name="SubRegion" type="FvSubRegionTypes"/>

-            <xs:element minOccurs="1" maxOccurs="1" name="Data" type="HexDataType"/>

-        </xs:sequence>

-    </xs:complexType>

-    <xs:complexType name="RegionDataType">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">Define the regions and their uses for the device</xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element minOccurs="1" maxOccurs="1" name="Name" type="UCNameType"/>

-            <xs:element minOccurs="1" maxOccurs="1" name="Size" type="HexAddressType"/>

-            <xs:element minOccurs="1" maxOccurs="unbounded" name="Attributes" type="EfiFvAttributeType"/>

-            <xs:element minOccurs="1" maxOccurs="1" name="AreaType" type="EfiFvAreaType"/>

-            <xs:element minOccurs="0" maxOccurs="unbounded" name="SubRegion" type="SubRegionType"/>

-        </xs:sequence>

-    </xs:complexType>

-    <xs:complexType name="SubRegionType">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">Define the regions and their uses for the device</xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element default="true" minOccurs="1" maxOccurs="1" name="CreateHob" type="xs:boolean"/>

-            <xs:element minOccurs="1" maxOccurs="1" name="Name" type="UCNameType"/>

-            <xs:element minOccurs="1" maxOccurs="1" name="Size" type="HexAddressType"/>

-            <xs:element minOccurs="1" maxOccurs="unbounded" name="Attributes" type="EfiFvAttributeType"/>

-            <xs:element minOccurs="1" maxOccurs="1" name="AreaType" type="EfiFvAreaType"/>

-            <xs:element minOccurs="1" maxOccurs="1" name="NameGuid" type="EfiNameGuidType"/>

-        </xs:sequence>

-    </xs:complexType>

-</xs:schema>

+<?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: FrameworkPlatformDataElements.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 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:include schemaLocation="FrameworkPlatformDataTypes.xsd"/>
+    <xs:element name="Capsule">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" name="CapsuleId" type="xs:string"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="CapsuleOptions"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="CapsuleAttributes"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="CapsuleAttributes">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This element is used specify different name value pairs.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="NameValue"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Enable"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Disable"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="CapsuleOptions">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This element is used specify different name value pairs.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="NameValue"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Enable"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Disable"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Capsules">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Permit multiple Capsule Sections</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element ref="Capsule"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Disable" type="xs:string"/>
+    <xs:element name="Enable" type="xs:string"/>
+    <xs:element name="Flash">
+        <xs:complexType>
+            <xs:annotation>
+                <xs:documentation xml:lang="en">We allow specifying the Flash layout in this directory, or we allow specifying a flashmap filename</xs:documentation>
+            </xs:annotation>
+            <xs:sequence>
+                <xs:choice>
+                    <xs:element name="FlashDefinition" type="FlashData"/>
+                    <xs:element name="FlashDefinitionFile" type="FileNameConvention"/>
+                </xs:choice>
+                <xs:element minOccurs="0" maxOccurs="1" ref="FvImages"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Capsules"/>
+            </xs:sequence>
+            <xs:attribute name="MicrocodeFile" type="FileNameConvention" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FlashDeviceImage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define contents of the regions in flash. The files and data are placed in the output image in the order they are encountered in this definition. Multiple FlashDeviceImage sections may be defined. Which one the tool should use is specified by Name on the command line.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:all>
+                <xs:element minOccurs="0" maxOccurs="1" name="RawData">
+                    <xs:complexType>
+                        <xs:sequence minOccurs="0" maxOccurs="1">
+                            <xs:element name="Data" type="xs:string"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="RawDataAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="1" name="File">
+                    <xs:complexType>
+                        <xs:attributeGroup ref="FlashDeviceImageFileAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:all>
+            <xs:attributeGroup ref="FlashDeviceImageAttributes"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FlashDeviceInfo">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is the Flash Devcie definition List</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="Blocks">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="255" name="Block">
+                                <xs:complexType>
+                                    <xs:simpleContent>
+                                        <xs:extension base="BlockNameType">
+                                            <xs:attributeGroup ref="BlockAttributes"/>
+                                        </xs:extension>
+                                    </xs:simpleContent>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="Regions">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="unbounded" name="Region">
+                                <xs:complexType>
+                                    <xs:all>
+                                        <xs:element name="SubRegions">
+                                            <xs:complexType>
+                                                <xs:sequence minOccurs="0" maxOccurs="unbounded">
+                                                    <xs:element name="SubRegion">
+                                                        <xs:complexType>
+                                                            <xs:simpleContent>
+                                                                <xs:extension base="xs:string">
+                                                                    <xs:attributeGroup ref="SubRegionAttributes"/>
+                                                                </xs:extension>
+                                                            </xs:simpleContent>
+                                                        </xs:complexType>
+                                                    </xs:element>
+                                                </xs:sequence>
+                                            </xs:complexType>
+                                        </xs:element>
+                                    </xs:all>
+                                    <xs:attributeGroup ref="RegionAttributes"/>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+            <xs:attributeGroup ref="FlashDeviceInfoAttributes"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FlashDeviceOverrideImage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define OVERRIDE contents of the regions in flash. Only what is different here from what may defined in other areas (or files) is needed </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="1" name="Name" type="NameConvention"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="File" type="FvImageOverrideFileType"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FlashDeviceOverrideInfo">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is the Flash Devcie Override Definition list. Only what is different from the previously defined stuff needs to be included.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="1" name="Name" type="UCNameType"/>
+                <xs:element default="512KB" minOccurs="0" maxOccurs="1" name="FlashSize" type="FlashSize"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="BaseAddress" type="HexAddressType"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="OutputDirectory" type="DirectoryNamingConvention"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="MicrocodeFile" type="FileNameConvention"/>
+                <xs:element minOccurs="0" maxOccurs="255" name="Block" type="BlockNameType"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Region" type="RegionDataType"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FvImage">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" ref="FvImageNames"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="FvImageOptions"/>
+            </xs:sequence>
+            <xs:attribute name="Type" type="FvImageTypes" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FvImageName">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="FvImageOptions"/>
+            </xs:sequence>
+            <xs:attribute name="Name" type="FvRegionTypes" use="required"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FvImageNames" type="xs:NCName"/>
+    <xs:element name="FvImageOptions">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This element is used specify different name value pairs.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="NameValue"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Enable"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Disable"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FvImages">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This section allows the user to define specific information regarding the FvImage</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="NameValue"/>
+                <xs:choice>
+                    <xs:element minOccurs="0" maxOccurs="unbounded" ref="FvImage"/>
+                    <xs:element minOccurs="0" maxOccurs="unbounded" ref="FvRegionName"/>
+                </xs:choice>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="FvImageName"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FvRegionName">
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="KeywordType">
+                    <xs:attributeGroup ref="FvRegionNameAttributes"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>    
+    <xs:element name="ModuleSA">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This element is used to specify information in the Platform Description File.</xs:documentation>
+            <xs:documentation xml:lang="en">This is a mixed element, allowing the user to specify the name of the MSA file, as well as to optionally specify additional override information.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1">
+                <!-- DO NOT USE! REMOVE SourceFiles in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="SourceFiles"/>
+                <!-- DO NOT USE! REMOVE Includes in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
+                <!-- Libraries stays in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Libraries"/>
+                <!-- DO NOT USE! REMOVE Protocols in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
+                <!-- DO NOT USE! REMOVE Events in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
+                <!-- DO NOT USE! REMOVE Hobs in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
+                <!-- DO NOT USE! REMOVE PPIs in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
+                <!-- DO NOT USE! REMOVE Variables in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
+                <!-- DO NOT USE! REMOVE BootModes in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
+                <!-- DO NOT USE! REMOVE SystemTables in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
+                <!-- DO NOT USE! REMOVE DataHubs in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
+                <!-- DO NOT USE! REMOVE Formsets in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
+                <!-- DO NOT USE! REMOVE Guids in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
+                <xs:choice minOccurs="0">
+                    <!-- DO NOT USE! REMOVE Externs stays in FINAL -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
+                    <xs:element minOccurs="0" maxOccurs="1" name="Extern">
+                        <xs:annotation>
+                            <xs:documentation xml:lang="en">Only specification is allow here. We need to let this be an addtion OR, if the WORD portion exists, this entry takes precedence.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexType>
+                            <xs:sequence>
+                                <xs:element minOccurs="1" maxOccurs="unbounded" ref="Specification"/>
+                            </xs:sequence>
+                        </xs:complexType>
+                    </xs:element>
+                </xs:choice>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Specification" type="Sentence"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDefinition"/>
+                <!-- BuildOptions stays in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="ModuleSaBuildOptions"/>
+            </xs:sequence>
+            <xs:attributeGroup ref="MsaAttributes"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="NameValue">
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:string">
+                    <xs:attribute name="Name" type="xs:string" use="required"/>
+                    <xs:attribute name="Value" type="xs:string" use="required"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Overrides">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">DO NOT USE! - Removing this from Schema</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="1" ref="FlashDeviceOverrideInfo"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="FlashDeviceOverrideImage"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PlatformDescriptions">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">DO NOT USE! - Use PlatformList instead</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence maxOccurs="unbounded">
+                <xs:element ref="Platform"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PlatformList">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is used in the Framework Database file</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence maxOccurs="unbounded">
+                <xs:element ref="Platform"/>
+                <xs:element name="Filename" type="PathAndFilename" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FrameworkModules">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is used in a Framework Platform Description (FPD) file</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:choice>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" maxOccurs="1" name="SEC" type="Components"/>
+                        <xs:element minOccurs="0" maxOccurs="1" name="PEI_CORE" type="Components"/>
+                        <xs:element minOccurs="0" maxOccurs="1" name="PEIM" type="Components"/>
+                        <xs:element minOccurs="0" maxOccurs="1" name="DXE_CORE" type="Components"/>
+                        <xs:element minOccurs="0" maxOccurs="1" name="DXE_DRIVERS" type="Components"/>
+                        <xs:element minOccurs="0" maxOccurs="1" name="OTHER_COMPONENTS" type="Components"/>
+                    </xs:sequence>
+                    <xs:element minOccurs="1" maxOccurs="unbounded" ref="ModuleSA"/>
+                </xs:choice>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="TianoImage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">DO NOT USE - Use FrameworkModules Instead.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="1" name="SEC" type="Components"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="PEI_CORE" type="Components"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="PEIM" type="Components"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="DXE_CORE" type="Components"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="DXE_DRIVERS" type="Components"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="OTHER_COMPONENTS" type="Components"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FlashDeviceDefinitions">
+        <xs:complexType>
+            <xs:annotation>
+                <xs:documentation xml:lang="en">We allow specifying the FlashMap filename</xs:documentation>
+            </xs:annotation>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="1" name="FlashDefinitionFile" type="PathAndFilename"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="FvImages"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PlatformDefinitions">
+        <xs:complexType>
+            <xs:sequence>
+                <!-- This is the list of ALL architectures that are supported by this Platform -->
+                <xs:element minOccurs="1" maxOccurs="1" name="SupportedArchitectures" type="ArchListType"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="BuildTargets" type="BuildTargetList"/>
+                <xs:element default="UNIFIED" name="IntermediateDirectories" type="IntermediateOutputType"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="OutputDirectory" type="xs:anyURI"/>
+                <!-- SkuInfo is only defined if Sku enabled -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="SkuInfo"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="FlashDeviceDefinitions"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="FfsFormatDeclarations"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>    
+    <xs:complexType name="Components">
+        <xs:sequence minOccurs="1" maxOccurs="unbounded">
+            <xs:element ref="ModuleSA"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="FlashData">
+        <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="UserDefinedFvRegion" type="NameConvention"/>
+            <xs:choice minOccurs="0" maxOccurs="1">
+                <xs:sequence>
+                    <xs:element minOccurs="1" maxOccurs="1" ref="FlashDeviceInfo"/>
+                    <xs:element minOccurs="1" maxOccurs="1" ref="FlashDeviceImage"/>
+                </xs:sequence>
+            </xs:choice>
+            <xs:element minOccurs="0" maxOccurs="1" ref="Overrides"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="FvImageFileType">
+        <xs:sequence>
+            <xs:element minOccurs="1" maxOccurs="1" name="Name" type="FileNameConvention"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="Region" type="FvRegionTypes"/>
+            <xs:element minOccurs="1" maxOccurs="unbounded" name="RawData" type="RawDataType"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="FvImageOverrideFileType">
+        <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="1" name="Name" type="FileNameConvention"/>
+            <xs:element minOccurs="0" maxOccurs="1" name="Region" type="FvRegionTypes"/>
+            <xs:element minOccurs="0" maxOccurs="1" name="UserDefinedFvRegion" type="NameConvention"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="RawData" type="RawDataType"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="RawDataType">
+        <xs:sequence>
+            <xs:element minOccurs="1" maxOccurs="1" name="Name" type="NameConvention"/>
+            <xs:element minOccurs="0" maxOccurs="1" name="Region" type="FvRegionTypes"/>
+            <xs:element minOccurs="0" maxOccurs="1" name="UserDefinedFvRegion" type="NameConvention"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="SubRegion" type="FvSubRegionTypes"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="Data" type="HexDataType"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="RegionDataType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define the regions and their uses for the device</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element minOccurs="1" maxOccurs="1" name="Name" type="UCNameType"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="Size" type="HexAddressType"/>
+            <xs:element minOccurs="1" maxOccurs="unbounded" name="Attributes" type="EfiFvAttributeType"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="AreaType" type="EfiFvAreaType"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="SubRegion" type="SubRegionType"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="SubRegionType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define the regions and their uses for the device</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element default="true" minOccurs="1" maxOccurs="1" name="CreateHob" type="xs:boolean"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="Name" type="UCNameType"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="Size" type="HexAddressType"/>
+            <xs:element minOccurs="1" maxOccurs="unbounded" name="Attributes" type="EfiFvAttributeType"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="AreaType" type="EfiFvAreaType"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="NameGuid" type="EfiNameGuidType"/>
+        </xs:sequence>
+    </xs:complexType>
+</xs:schema>
diff --git a/Tools/XMLSchema/SurfaceArea.xsd b/Tools/XMLSchema/SurfaceArea.xsd
index 4c3f16f822..c5de6b3082 100644
--- a/Tools/XMLSchema/SurfaceArea.xsd
+++ b/Tools/XMLSchema/SurfaceArea.xsd
@@ -37,18 +37,11 @@
             <xs:sequence>

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

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

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

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

                 <!-- DO NOT USE! removing TianoImage, use FrameworkModules instead. -->

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

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

-                <!-- DO NOT USE! removing PcdBuildDeclarations here, use PcdBuildDeclaratiion in ModuleSA instead. -->

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

-                <xs:choice minOccurs="0">

-                    <!-- DO NOT USE! removing PcdDynamicBuildDeclarations here, use DynamicPcdBuildDefinitions in ModuleSA instead. -->

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

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

-                </xs:choice>

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

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

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

             </xs:sequence>