diff options
| author | lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-06-19 03:23:13 +0000 |
|---|---|---|
| committer | lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-06-19 03:23:13 +0000 |
| commit | c9d4af28284f3cd913bef7369fad51dbea5e532a (patch) | |
| tree | d80b989f6ba3326a482d7c706a16b9cbb4f8d5c5 | |
| parent | bcbd4243f4039fe52bb5ac0a86131a0ac60540fe (diff) | |
| download | edk2-c9d4af28284f3cd913bef7369fad51dbea5e532a.zip edk2-c9d4af28284f3cd913bef7369fad51dbea5e532a.tar.gz edk2-c9d4af28284f3cd913bef7369fad51dbea5e532a.tar.bz2 | |
Removed the ValidSKUs element from the BuildOptions in FPD file, Added FfsFileNameGuid element to ModuleSaBuildOptions within the same scope as the FvBinding element. Also added the VariableGuidC_NameType, and changed the data type of the HiiPackage element: VariableGuid to this data type.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/tools_branch@554 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | Tools/XMLSchema/FrameworkDataElements.xsd | 5 | ||||
| -rw-r--r-- | Tools/XMLSchema/NamingConvention.xsd | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd index e8943a0..3773039 100644 --- a/Tools/XMLSchema/FrameworkDataElements.xsd +++ b/Tools/XMLSchema/FrameworkDataElements.xsd @@ -85,7 +85,6 @@ <xs:complexType>
<xs:sequence>
<!-- This identifies which SKU ID Numbers are valid for this single build! It may be overriden by some sort of environment setting-->
- <xs:element minOccurs="0" maxOccurs="1" name="ValidSKUs" type="SkuListType"/>
<xs:element minOccurs="0" maxOccurs="1" ref="UserDefinedAntTasks"/>
<!-- Options list the Flags available for each defined tool -->
<xs:element minOccurs="0" maxOccurs="1" ref="Options"/>
@@ -439,6 +438,8 @@ <xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="1" name="FvBinding" type="FfsNameType"/>
+ <!-- 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 -->
<xs:element minOccurs="0" maxOccurs="1" name="FfsFormatKey" type="FfsNameType"/>
<xs:element minOccurs="0" maxOccurs="1" ref="Options"/>
@@ -573,7 +574,7 @@ </xs:annotation>
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="VariableName" type="VariableNameDataType"/>
- <xs:element minOccurs="1" maxOccurs="1" name="VariableGuid" type="VariableGuidType"/>
+ <xs:element minOccurs="1" maxOccurs="1" name="VariableGuid" type="VariableGuidC_NameType"/>
<xs:element minOccurs="1" maxOccurs="1" name="VariableOffset" type="Hex64BitDataType"/>
<xs:element minOccurs="1" maxOccurs="1" name="HiiDefaultValue" type="DefaultValueType"/>
</xs:sequence>
diff --git a/Tools/XMLSchema/NamingConvention.xsd b/Tools/XMLSchema/NamingConvention.xsd index 04ec7ef..aa40cc5 100644 --- a/Tools/XMLSchema/NamingConvention.xsd +++ b/Tools/XMLSchema/NamingConvention.xsd @@ -158,6 +158,14 @@ <xs:pattern value="[A-Z]+(_*[A-Z0-9]*)*"/>
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="VariableGuidC_NameType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"> VariableGuidC_Names must start with either an underscore (_) character followed by one or more alpha characters, followed by any combination of underscore or alphanumeric characters.</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="((_)*([a-zA-Z])+((_)*[a-zA-Z0-9]*))*"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:simpleType name="VariableGuidType">
<xs:annotation>
<xs:documentation xml:lang="en"> The GUID data is union of GuidType1 and GuidType2. </xs:documentation>
|