merged the new schema except to those PCD related

[mirror_edk2.git] / Tools / XMLSchema / SurfaceArea.xsd

diff --git a/Tools/XMLSchema/SurfaceArea.xsd b/Tools/XMLSchema/SurfaceArea.xsd
index ca44ce780c140969e6e28f39ce7e00580835710c..4c3f16f822f960fc91de5be9f36c731ad7f28d76 100644 (file)
--- a/Tools/XMLSchema/SurfaceArea.xsd
+++ b/Tools/XMLSchema/SurfaceArea.xsd
@@ -24,6 +24,8 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="FdbHeader"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="PackageList"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="PlatformList"/>\r
+                <xs:element minOccurs="1" maxOccurs="1" ref="FarList"/>                \r
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -34,6 +36,7 @@
         <xs:complexType>\r
             <xs:sequence>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="PlatformHeader"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="PlatformDefinitions"/>                \r
                 <xs:element minOccurs="0" maxOccurs="1" ref="SkuInfo"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Flash"/>\r
                 <!-- DO NOT USE! removing TianoImage, use FrameworkModules instead. -->\r
@@ -138,6 +141,7 @@
         <xs:complexType>\r
             <xs:sequence>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="MsaHeader"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="ModuleDefinitions"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDefinitions"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="SourceFiles"/>\r
                 <xs:choice minOccurs="0">\r
@@ -164,6 +168,7 @@
                     <xs:element minOccurs="0" maxOccurs="1" ref="PcdCoded"/>\r
                 </xs:choice>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="ModuleBuildOptions"/>\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
@@ -175,13 +180,13 @@
         <xs:complexType>\r
             <xs:sequence>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="SpdHeader"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="PackageDefinitions"/>                \r
                 <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDeclarations"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="IndustryStdIncludes"/>\r
                 <!-- DO NOT USE removing THIS INSTANCE of PackageDependencies, this is moving to FDP installation process -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>\r
                 <!-- DO NOT USE removing MsaFiles, use MsaFileList instead , do not wrap in choice, too many entries to convert all at once. -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="MsaFiles"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="MsaFileList"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="PackageHeaders"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="GuidDeclarations"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="ProtocolDeclarations"/>\r