X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FXMLSchema%2FFrameworkPlatformDataElements.xsd;h=a32b28c2f361f288bd81c2d3624848ad039e5b32;hp=5cbaaca699fae05145093ee6f3966409652f0842;hb=d84573dbd1dd5a212e3b1856f96c18e867641025;hpb=878ddf1fc3540a715f63594ed22b6929e881afb4

diff --git a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
index 5cbaaca699..a32b28c2f3 100644
--- a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
@@ -16,8 +16,10 @@
         <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>
@@ -73,8 +75,8 @@
                     <xs:element name="FlashDefinition" type="FlashData"/>
                     <xs:element name="FlashDefinitionFile" type="FileNameConvention"/>
                 </xs:choice>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="FvImages"/>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Capsules"/>
+                <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>
@@ -84,10 +86,22 @@
             <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:sequence minOccurs="1" maxOccurs="unbounded">
-                <xs:element minOccurs="1" maxOccurs="1" name="Name" type="NameConvention"/>
-                <xs:element minOccurs="0" maxOccurs="unbounded" name="File" type="FvImageFileType"/>
-            </xs:sequence>
+            <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">
@@ -96,14 +110,51 @@
         </xs:annotation>
         <xs:complexType>
             <xs:sequence>
-                <xs:element minOccurs="1" maxOccurs="1" name="Name" type="UCNameType"/>
-                <xs:element default="512KB" minOccurs="1" maxOccurs="1" name="FlashSize" type="FlashSize"/>
-                <xs:element minOccurs="1" maxOccurs="1" name="BaseAddress" type="HexAddressType"/>
-                <xs:element minOccurs="1" maxOccurs="1" name="OutputDirectory" type="DirectoryNamingConvention"/>
-                <xs:element minOccurs="0" maxOccurs="1" name="MicrocodeFile" type="FileNameConvention"/>
-                <xs:element minOccurs="1" maxOccurs="255" name="Block" type="BlockNameType"/>
-                <xs:element minOccurs="1" maxOccurs="unbounded" name="Region" type="RegionDataType"/>
+                <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">
@@ -139,7 +190,7 @@
                 <xs:element minOccurs="1" maxOccurs="unbounded" ref="FvImageNames"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="FvImageOptions"/>
             </xs:sequence>
-            <xs:attribute name="Type" type="xs:string" use="optional"/>
+            <xs:attribute name="Type" type="FvImageTypes" use="optional"/>
         </xs:complexType>
     </xs:element>
     <xs:element name="FvImageName">
@@ -150,7 +201,7 @@
             <xs:attribute name="Name" type="FvRegionTypes" use="required"/>
         </xs:complexType>
     </xs:element>
-    <xs:element name="FvImageNames" type="xs:string"/>
+    <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>
@@ -182,20 +233,54 @@
         </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:element minOccurs="0" maxOccurs="1" ref="Externs"/>
+                <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: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:sequence>
             <xs:attributeGroup ref="MsaAttributes"/>
         </xs:complexType>
@@ -211,6 +296,9 @@
         </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"/>
@@ -219,75 +307,60 @@
         </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="TianoImage">
+    <xs:element name="PlatformList">
         <xs:annotation>
-            <xs:documentation xml:lang="en">This defines the required sections of a valid EFI/Tiano binary image</xs:documentation>
+            <xs:documentation xml:lang="en">This is used in the Framework Database file</xs:documentation>
         </xs:annotation>
         <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="1" maxOccurs="1" name="SEC" type="Components"/>
-                <xs:element minOccurs="1" maxOccurs="1" name="PEI_CORE" type="Components"/>
-                <xs:element minOccurs="1" maxOccurs="1" name="PEIM" type="Components"/>
-                <xs:element minOccurs="1" maxOccurs="1" name="DXE_CORE" type="Components"/>
-                <xs:element minOccurs="1" maxOccurs="1" name="DXE_DRIVERS" type="Components"/>
-                <xs:element minOccurs="0" maxOccurs="1" name="OTHER_COMPONENTS" type="Components"/>
+            <xs:sequence maxOccurs="unbounded">
+                <xs:element ref="Platform"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    <xs:simpleType name="EfiFvAttributeType">
+    <xs:element name="FrameworkModules">
         <xs:annotation>
-            <xs:documentation xml:lang="en">The list of EFI_FLASH_AREA Attributes</xs:documentation>
+            <xs:documentation xml:lang="en">This is used in a Framework Platform Description (FPD) file</xs:documentation>
         </xs:annotation>
-        <xs:restriction base="UCNameType">
-            <xs:enumeration value="EFI_FLASH_AREA_FV"/>
-            <xs:enumeration value="EFI_FLASH_AREA_MEMMAPPED_FV"/>
-            <xs:enumeration value="EFI_FLASH_AREA_SUBFV"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="EfiFvAreaType">
-        <xs:annotation>
-            <xs:documentation xml:lang="en">The list of valid EFI Area Types</xs:documentation>
-        </xs:annotation>
-        <xs:restriction base="UCNameType">
-            <xs:enumeration value="EFI_FLASH_AREA_EFI_VARIABLES"/>
-            <xs:enumeration value="EFI_FLASH_AREA_UNUSED"/>
-            <xs:enumeration value="EFI_FLASH_AREA_MAIN_BIOS"/>
-            <xs:enumeration value="EFI_FLASH_AREA_GUID_DEFINED"/>
-            <xs:enumeration value="EFI_FLASH_AREA_FTW_STATE"/>
-            <xs:enumeration value="EFI_FLASH_AREA_FTW_BACKUP"/>
-            <xs:enumeration value="EFI_FLASH_AREA_RECOVERY_BIOS"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="EfiNameGuidType">
+        <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">Right now, only EFI_FLASH_MAP_HOB_GUID is defined</xs:documentation>
+            <xs:documentation xml:lang="en">DO NOT USE - Use FrameworkModules Instead.</xs:documentation>
         </xs:annotation>
-        <xs:restriction base="UCNameType">
-            <xs:enumeration value="EFI_FLASH_MAP_HOB_GUID"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="FlashSize">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="256KB"/>
-            <xs:enumeration value="512KB"/>
-            <xs:enumeration value="1MB"/>
-            <xs:enumeration value="2MB"/>
-            <xs:enumeration value="4MB"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="FvSubRegionTypes">
-        <xs:restriction base="UCNameType">
-            <xs:enumeration value="NV_VARIABLE_STORE"/>
-            <xs:enumeration value="MICROCODE"/>
-            <xs:enumeration value="NV_FTW_WORKING"/>
-        </xs:restriction>
-    </xs:simpleType>
+        <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:complexType name="Components">
         <xs:sequence minOccurs="1" maxOccurs="unbounded">
             <xs:element ref="ModuleSA"/>