X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FXMLSchema%2FFrameworkDataElements.xsd;h=977020829bc439ec222821413f54f571baa872bf;hb=cfe9de52447337bd470bd831080f5671ed979fe6;hp=59bdcbdebe7b5f11f46dce5c33af2ebcbb1cc3ad;hpb=92fb44010ea599ab658671a0e1c8064b09cc7112;p=mirror_edk2.git

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 59bdcbdebe..977020829b 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -66,29 +66,13 @@
         <xs:element minOccurs="0" maxOccurs="1" ref="Options"/>
         <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>
         <!-- The following sections are legacy and will be removed -->
-        <xs:element minOccurs="0" maxOccurs="1" name="OutputDirectory">
-          <xs:complexType>
-            <xs:simpleContent>
-              <xs:extension base="xs:anyURI">
-                <xs:attribute default="UNIFIED" name="IntermediateDirectories" use="optional">
-                  <xs:simpleType>
-                    <xs:restriction base="UCNameType">
-                      <xs:enumeration value="MODULE"/>
-                      <xs:enumeration value="UNIFIED"/>
-                    </xs:restriction>
-                  </xs:simpleType>
-                </xs:attribute>
-              </xs:extension>
-            </xs:simpleContent>
-          </xs:complexType>
-        </xs:element>
         <xs:element minOccurs="0" maxOccurs="unbounded" name="Ffs">
           <xs:complexType>
             <xs:sequence>
               <xs:element minOccurs="0" maxOccurs="unbounded" name="Attribute">
                 <xs:complexType>
                   <xs:attribute name="Name" type="C_NameType"/>
-                  <xs:attribute name="Value" type="C_NameType"/>
+                  <xs:attribute name="Value" type="xs:string"/>
                 </xs:complexType>
               </xs:element>
               <xs:element minOccurs="0" maxOccurs="1" name="Sections">
@@ -133,45 +117,6 @@
             <xs:attribute name="FfsKey" type="KeywordType" use="optional"/>
           </xs:complexType>
         </xs:element>
-        <xs:element minOccurs="0" maxOccurs="1" name="Sections">
-          <xs:complexType>
-            <xs:sequence minOccurs="1">
-              <xs:element name="Section" minOccurs="0" maxOccurs="unbounded">
-                <xs:complexType>
-                  <xs:sequence>
-                    <xs:element ref=" Filenames " minOccurs="0"/>
-                    <xs:element name="Args" type=" ArgsType " minOccurs="0"/>
-                    <xs:element name="OutFile" type=" FileNameConvention " minOccurs="0"/>
-                    <xs:element name="OutputFileExtension" type=" xs:string " minOccurs="0"/>
-                    <xs:element name="ToolName" type=" ToolType " minOccurs="0"/>
-                  </xs:sequence>
-                  <xs:attributeGroup ref=" SectionsAttributes "/>
-                </xs:complexType>
-              </xs:element>
-              <xs:element name="Sections" minOccurs="0" maxOccurs="unbounded">
-                <xs:complexType>
-                  <xs:sequence minOccurs="1" maxOccurs="unbounded">
-                    <xs:element name="Section">
-                      <xs:complexType>
-                        <xs:sequence>
-                          <xs:element ref=" Filenames " minOccurs="0"/>
-                          <xs:element name="Args" type=" ArgsType " minOccurs="0"/>
-                          <xs:element name="OutFile" type=" FileNameConvention " minOccurs="0"/>
-                          <xs:element name="OutputFileExtension" type=" xs:string " minOccurs="0"/>
-                          <xs:element name="ToolName" type=" ToolType " minOccurs="0"/>
-                        </xs:sequence>
-                        <xs:attributeGroup ref=" SectionsAttributes "/>
-                      </xs:complexType>
-                    </xs:element>
-                  </xs:sequence>
-                  <xs:attributeGroup ref=" SectionsAttributes "/>
-                </xs:complexType>
-              </xs:element>
-            </xs:sequence>
-            <xs:attributeGroup ref=" SectionsAttributes "/>
-          </xs:complexType>
-        </xs:element>
-        <!-- Remove to Here -->
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -292,35 +237,36 @@
     <xs:complexType>
       <xs:sequence minOccurs="1">
         <xs:element minOccurs="0" maxOccurs="1" name="PcdIsDriver" type="PcdDriverTypes"/>
+        <xs:element minOccurs="0" maxOccurs="1" name="TianoR8FlashMap_h" type="xs:boolean" default="false"/>
         <xs:element minOccurs="0" maxOccurs="unbounded" name="Specification" type="Sentence"/>
         <xs:element minOccurs="0" maxOccurs="unbounded" name="Extern">
           <xs:complexType>
-            <xs:choice minOccurs="1">
-              <xs:sequence>
+            <xs:choice minOccurs="1" maxOccurs="1">
+              <xs:sequence minOccurs="0" maxOccurs="1">
                 <xs:annotation>
                   <xs:documentation xml:lang="en">Driver Module</xs:documentation>
                 </xs:annotation>
                 <xs:element minOccurs="0" maxOccurs="1" name="ModuleEntryPoint" type="C_NameType"/>
                 <xs:element minOccurs="0" maxOccurs="1" name="ModuleUnloadImage" type="C_NameType"/>
               </xs:sequence>
-              <xs:sequence>
+              <xs:sequence minOccurs="0" maxOccurs="1">
                 <xs:annotation>
                   <xs:documentation xml:lang="en">Library Module</xs:documentation>
                 </xs:annotation>
                 <xs:element minOccurs="0" maxOccurs="1" name="Constructor" type="C_NameType"/>
                 <xs:element minOccurs="0" maxOccurs="1" name="Destructor" type="C_NameType"/>
               </xs:sequence>
-              <xs:sequence>
+              <xs:sequence minOccurs="0" maxOccurs="1">
                 <xs:annotation>
                   <xs:documentation xml:lang="en">Allow multiple entries for DriverBinding, ComponentName, DriverConfig and DriverDiag elements. For ComponentName, DriverConfig and/or DriverDiag - you must have a 1:1 mapping to DriverBinding if the element is defined.</xs:documentation>
                   <xs:documentation xml:lang="en">Permit User Defined Extern Tags</xs:documentation>
                 </xs:annotation>
-                <xs:element minOccurs="0" maxOccurs="1" name="DriverBinding" type="C_NameType"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="DriverBinding" type="C_NameType"/>
                 <xs:element minOccurs="0" maxOccurs="1" name="ComponentName" type="C_NameType"/>
                 <xs:element minOccurs="0" maxOccurs="1" name="DriverConfig" type="C_NameType"/>
                 <xs:element minOccurs="0" maxOccurs="1" name="DriverDiag" type="C_NameType"/>
               </xs:sequence>
-              <xs:sequence>
+              <xs:sequence minOccurs="0" maxOccurs="1">
                 <xs:annotation>
                   <xs:documentation xml:lang="en"> Module Call Backs</xs:documentation>
                 </xs:annotation>
@@ -515,14 +461,15 @@
   <xs:element name="ModuleBuildOptions">
     <xs:complexType>
       <xs:sequence>
-        <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" namespace="##local"/>
+        <xs:element minOccurs="0" maxOccurs="1" ref="Options"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="ModuleSaBuildOptions">
     <xs:complexType>
       <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="1" name="FvBinding" type="KeywordType"/>
+        <xs:element minOccurs="0" maxOccurs="1" name="FvBinding" type="KeywordList"/>
         <!-- The FfsFileNameGuid allows the Platform Integrator to specify a GUID for the FFS File Name GUID -->
         <xs:element minOccurs="0" maxOccurs="1" name="FfsFileNameGuid" type="GuidType"/>
         <!-- If binding is specified, you MUST specify the FfsFormatKey -->
@@ -548,6 +495,10 @@
                     <xs:element minOccurs="1" maxOccurs="1" name="ModuleGuid" type="GuidType"/>
                     <xs:element minOccurs="1" maxOccurs="1" name="ModuleVersion" type="VersionDataType"/>
                   </xs:sequence>
+                  <!-- The Id is a number used to track heritage  the first entry will be 0 and increment from then on. -->
+                  <xs:attribute name="Id" type="xs:nonNegativeInteger" use="required"/>
+                  <!-- If the original module was installed from a FAR, track the FAR it came from. -->
+                  <xs:attribute name="FarGuid" type="GuidType" use="optional"/>
                 </xs:complexType>
               </xs:element>
             </xs:sequence>
@@ -579,6 +530,13 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="NonProcessedFiles">
+    <xs:complexType>
+      <xs:sequence minOccurs="1" maxOccurs="unbounded">
+        <xs:element name="Filename" type="PathAndFilename"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="Option">
     <!-- This element is used to store flags from the Tools -->
     <xs:complexType>
@@ -603,6 +561,10 @@
                     <xs:element minOccurs="1" maxOccurs="1" name="PackageGuid" type="GuidType"/>
                     <xs:element minOccurs="1" maxOccurs="1" name="PackageVersion" type="VersionDataType"/>
                   </xs:sequence>
+                  <!-- The Id is a number used to track heritage  the first entry will be 0 and increment from then on. -->
+                  <xs:attribute name="Id" type="xs:nonNegativeInteger" use="required"/>
+                  <!-- If the original Package was installed from a FAR, track the FAR it came from. -->
+                  <xs:attribute name="FarGuid" type="GuidType" use="optional"/>
                 </xs:complexType>
               </xs:element>
             </xs:sequence>
@@ -869,12 +831,21 @@
   <xs:element name="ProcessStep">
     <xs:complexType>
       <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" name="ToolName" type="xs:string"/>
-        <xs:element minOccurs="0" maxOccurs="1" name="ToolArgs" type="xs:string"/>
-        <!-- Input patterns  to be processed by the tool above -->
-        <xs:element minOccurs="0" maxOccurs="1" name="InputPattern" type="xs:string"/>
-        <!-- A pattern to match for the output -->
-        <xs:element minOccurs="1" maxOccurs="1" name="OutputPattern" type="xs:string"/>
+        <!-- The following is a macro for Apache ANT -->
+        <xs:element minOccurs="0" maxOccurs="1" name="MacroDefFile">
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:extension base="PathAndFilename">
+                <xs:attribute name="MacroName" type="KeywordType" use="required"/>
+              </xs:extension>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
+        <!-- The following is for System Executables -->
+        <xs:element minOccurs="0" maxOccurs="1" name="ToolName" type="xs:NCName"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" name="ToolArgs" type="xs:normalizedString"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" name="InputPattern" type="xs:normalizedString"/>
+        <xs:element minOccurs="0" maxOccurs="1" name="OutputPattern" type="xs:normalizedString"/>
       </xs:sequence>
       <xs:attributeGroup ref="ProcessStepAttributes"/>
     </xs:complexType>
@@ -936,10 +907,10 @@
   <xs:element name="UserExtensions">
     <xs:complexType>
       <xs:sequence>
-        <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" namespace="##local"/>
+        <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
       </xs:sequence>
       <xs:attribute name="UserID" type="xs:NCName" use="required"/>
-      <xs:attribute name="Identifier" type="xs:nonNegativeInteger" use="required"/>
+      <xs:attribute name="Identifier" type="xs:string" use="required"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="Variables">