X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FXMLSchema%2FSurfaceArea.xsd;h=c5de6b308270b5b261da90b74f5a7e6aa0091b46;hp=ca44ce780c140969e6e28f39ce7e00580835710c;hb=b1d9f2a3cb7835d73851ab7ff37d920e3c702c35;hpb=95945c7635df90c9d95ac93aa1f9bf725fd24ab6

diff --git a/Tools/XMLSchema/SurfaceArea.xsd b/Tools/XMLSchema/SurfaceArea.xsd
index ca44ce780c..c5de6b3082 100644
--- a/Tools/XMLSchema/SurfaceArea.xsd
+++ b/Tools/XMLSchema/SurfaceArea.xsd
@@ -24,6 +24,8 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="FdbHeader"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="PackageList"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="PlatformList"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="FarList"/>                
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -34,18 +36,12 @@
         <xs:complexType>
             <xs:sequence>
                 <xs:element minOccurs="1" maxOccurs="1" ref="PlatformHeader"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="SkuInfo"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PlatformDefinitions"/>                
                 <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>
@@ -138,6 +134,7 @@
         <xs:complexType>
             <xs:sequence>
                 <xs:element minOccurs="1" maxOccurs="1" ref="MsaHeader"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="ModuleDefinitions"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDefinitions"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="SourceFiles"/>
                 <xs:choice minOccurs="0">
@@ -164,6 +161,7 @@
                     <xs:element minOccurs="0" maxOccurs="1" ref="PcdCoded"/>
                 </xs:choice>
                 <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="ModuleBuildOptions"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>
             </xs:sequence>
         </xs:complexType>
@@ -175,13 +173,13 @@
         <xs:complexType>
             <xs:sequence>
                 <xs:element minOccurs="1" maxOccurs="1" ref="SpdHeader"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PackageDefinitions"/>                
                 <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDeclarations"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="IndustryStdIncludes"/>
                 <!-- DO NOT USE removing THIS INSTANCE of PackageDependencies, this is moving to FDP installation process -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>
                 <!-- DO NOT USE removing MsaFiles, use MsaFileList instead , do not wrap in choice, too many entries to convert all at once. -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="MsaFiles"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="MsaFileList"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="PackageHeaders"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="GuidDeclarations"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="ProtocolDeclarations"/>