Reviewed-by: Liming Gao <liming....@intel.com>
>-----Original Message-----
>From: Zhu, Yonghong
>Sent: Tuesday, April 03, 2018 3:18 PM
>To: edk2-devel@lists.01.org
>Cc: Gao, Liming <liming....@intel.com>; Kinney, Michael D
><michael.d.kin...@intel.com>; Shaw, Kevin W <kevin.w.s...@intel.com>
>Subject: [Patch] DSC spec: Update version to 1.28
>
>Cc: Liming Gao <liming....@intel.com>
>Cc: Michael Kinney <michael.d.kin...@intel.com>
>Cc: Kevin W Shaw <kevin.w.s...@intel.com>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Yonghong Zhu <yonghong....@intel.com>
>---
> 2_dsc_overview/23_[defines]_section_processing.md | 6 +++---
> 2_dsc_overview/README.md | 4 ++--
> 3_edk_ii_dsc_file_format/35_[defines]_section.md | 10 +++++-----
> README.md | 8 +++++++-
> SUMMARY.md | 1 +
> appendix_b_sample_edk_ii_dsc_file.md | 4 ++--
> 6 files changed, 20 insertions(+), 13 deletions(-)
>
>diff --git a/2_dsc_overview/23_[defines]_section_processing.md
>b/2_dsc_overview/23_[defines]_section_processing.md
>index a7e8680..428196b 100644
>--- a/2_dsc_overview/23_[defines]_section_processing.md
>+++ b/2_dsc_overview/23_[defines]_section_processing.md
>@@ -1,9 +1,9 @@
> <!--- @file
> 2.3 [Defines] Section Processing
>
>- Copyright (c) 2006-2017, Intel Corporation. All rights reserved.<BR>
>+ Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
>
> Redistribution and use in source (original document form) and 'compiled'
> forms (converted to PDF, epub, HTML and other formats) with or without
> modification, are permitted provided that the following conditions are met:
>
>@@ -97,12 +97,12 @@ item is required.
> ###### Table 6 EDK II [Defines] Section Elements
>
>
> | Typical Tag Names | Required / Optional | Value
> | Notes
>|
> | ----------------------------- | ----------- |
> -------------------------------- | ------------
>-----------------------------------------------------------------------------------------------
>-----------------------------------------------------------------------------------------------
>-----------------------------------------------------------------------------------------------
>-----------------------------------------------------------------------------------------------
>----------------------- |
>-| `DSC_SPECIFICATION` | Required | 0x0001001B or 1.27
> | This
>entry is required for all EDK II DSC files. The value, 0x0001001B matches the
>1.27 version of this specification. Build tools must continue to support DSC
>files
>that correspond to earlier versions of the document until such time as earlier
>versions are no longer in use. In order to maintain backward compatibility,
>this
>value must only be updated in existing DSC files if other content in the file
>is
>updated. |
>-| | |
> | This value may also be specified
>as decimal value, i.e., 1.27.
>|
>+| `DSC_SPECIFICATION` | Required | 0x0001001C or 1.28
> | This
>entry is required for all EDK II DSC files. The value, 0x0001001C matches the
>1.28 version of this specification. Build tools must continue to support DSC
>files
>that correspond to earlier versions of the document until such time as earlier
>versions are no longer in use. In order to maintain backward compatibility,
>this
>value must only be updated in existing DSC files if other content in the file
>is
>updated. |
>+| | |
> | This value may also be specified
>as decimal value, i.e., 1.28.
>|
> | `PLATFORM_GUID` | Required | Registry Format
> GUID(8-4-4-4-12)
>| The GUID value, along the PLATFORM_VERSION, is used to uniquely identify
>a platform file. It is recommended that minor changes to the file increment
>the PLATFORM_VERSION value, and that the GUID value change for
>completely new platforms.
>|
> | `PLATFORM_VERSION` | Required | Integer or Decimal Number
> |
>The Version value, along the PLATFORM_GUID, is used to uniquely identify a
>platform file. It is recommended that minor changes to the file increment the
>PLATFORM_VERSION value, and that the GUID value change for completely
>new platforms.
>|
> | `PLATFORM_NAME` | Required | Single Word
> | Only
>alphanumeric, dash and underscore character are permitted
>|
> | `SKUID_IDENTIFIER` | Required | Formatted text
> | This
>value may be passed on the command line and must match one of the
>defined names in the [SkuIds] section. If it is passed on the command line, the
>command line value takes precedence.
>|
> | `SUPPORTED_ARCHITECTURES` | Required | List
> | Pipe
>("<code>|</code>") separated list of architectures that the platform
>supports
>|
>diff --git a/2_dsc_overview/README.md b/2_dsc_overview/README.md
>index a8cfa48..0d1b255 100644
>--- a/2_dsc_overview/README.md
>+++ b/2_dsc_overview/README.md
>@@ -1,9 +1,9 @@
> <!--- @file
> 2 DSC Overview
>
>- Copyright (c) 2006-2017, Intel Corporation. All rights reserved.<BR>
>+ Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
>
> Redistribution and use in source (original document form) and 'compiled'
> forms (converted to PDF, epub, HTML and other formats) with or without
> modification, are permitted provided that the following conditions are met:
>
>@@ -48,11 +48,11 @@ methods). EDK II DSC files are a list of:
> * EDK II PCD Entries
>
> There are no new features or format introduced in this specification.
>
> DSC files that use any new features must use the new
>-`DSC_SPECIFICATION = 0x0001001B` in the `[Defines]` section. Older DSC files
>+`DSC_SPECIFICATION = 0x0001001C` in the `[Defines]` section. Older DSC files
> that do not use any of these features do not need to update the
> `DSC_SPECIFICATION` value.
>
> This version of the specification reflects changes to the EDK II reference
> build system that has been updated to support builds using EDK II Packages
>that
>diff --git a/3_edk_ii_dsc_file_format/35_[defines]_section.md
>b/3_edk_ii_dsc_file_format/35_[defines]_section.md
>index 8950b80..3961e4c 100644
>--- a/3_edk_ii_dsc_file_format/35_[defines]_section.md
>+++ b/3_edk_ii_dsc_file_format/35_[defines]_section.md
>@@ -1,9 +1,9 @@
> <!--- @file
> 3.5 [Defines] Section
>
>- Copyright (c) 2006-2017, Intel Corporation. All rights reserved.<BR>
>+ Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
>
> Redistribution and use in source (original document form) and 'compiled'
> forms (converted to PDF, epub, HTML and other formats) with or without
> modification, are permitted provided that the following conditions are met:
>
>@@ -70,11 +70,11 @@ other meta-data files.
> **Note:** Assignments of variables in other sections take precedence over
> global assignments.
> **********
>
> This revision of specification does not add new features. New EDK II DSC files
>-must include the statement: `DSC_SPECIFICATION = 0x0001001B` in this
>section.
>+must include the statement: `DSC_SPECIFICATION = 0x0001001C` in this
>section.
> Existing DSC files do not need to update the value.
>
> Individual items must appear on a single line, they may not span multiple
> lines.
>
> Of special note is the `FLASH_DEFINITION` file name. Unlike other file names
>in
>@@ -155,14 +155,14 @@ Code> ::= ISO 639-2 Format Language code
> #### Parameters
>
> **_SpecVal_**
>
> New DSC files or DSC files that get updated to use any of the new features
>-defined in this specification must ensure that the 0x0001001B value is used.
>+defined in this specification must ensure that the 0x0001001C value is used.
> The EDK II build system must maintain backward compatibility, therefore,
>there
> is no requirement to change existing DSC files if no other content changes.
>-This value may also be specified as a decimal value of 1.27.
>+This value may also be specified as a decimal value of 1.28.
>
> **_SkuUiName_**
>
> If specified, the image created from the DSC/FDF file pair will only be valid
> for the SkuUiNames listed. If not specified, and the `[SKUIDS]` section is
>@@ -219,11 +219,11 @@ compiling them into a machine language program.
> ```ini
> [Defines]
> PLATFORM_NAME = NT32
> PLATFORM_GUID = EB216561-961F-47EE-9EF9-CA426EF547C2
> PLATFORM_VERSION = 0.3
>- DSC_SPECIFICATION = 0x0001001B
>+ DSC_SPECIFICATION = 0x0001001C
> OUTPUT_DIRECTORY = Build/Nt32
> SUPPORTED_ARCHITECTURES = IA32
> BUILD_TARGETS = DEBUG|RELEASE
> RFC_LANGUAGES = "en-us;
> zh-hans;fr-fr"
>diff --git a/README.md b/README.md
>index dd3419a..3e14b34 100644
>--- a/README.md
>+++ b/README.md
>@@ -1,9 +1,9 @@
> <!--- @file
> README.md for EDK II Platform Description (DSC) File Specification
>
>- Copyright (c) 2006-2017, Intel Corporation. All rights reserved.<BR>
>+ Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
>
> Redistribution and use in source (original document form) and 'compiled'
> forms (converted to PDF, epub, HTML and other formats) with or without
> modification, are permitted provided that the following conditions are met:
>
>@@ -184,5 +184,11 @@ Copyright (c) 2006-2017, Intel Corporation. All rights
>reserved.
> | | [#519](https://bugzilla.tianocore.org/show_bug.cgi?id=519) DSC
>Spec: update Precedence of PCD Values
>| |
> | | [#584](https://bugzilla.tianocore.org/show_bug.cgi?id=584) DSC
>Spec: Update the DSC_SPECIFICATION version to 0x0001001B or 1.27
>| |
> | | [#645](https://bugzilla.tianocore.org/show_bug.cgi?id=645) DSC
>Spec: Remove Restriction on Using NULL in [LibraryClasses] Section
>| |
> | | [#669](https://bugzilla.tianocore.org/show_bug.cgi?id=669) DSC
>Spec: Add multi-arg support to PREBUILD/POSTBUILD
>| |
> | | [#597](https://bugzilla.tianocore.org/show_bug.cgi?id=597) DSC
>Spec: Hii type Pcd VariableName is NOT allowed to be empty string
>| |
>+| 1.28 | Update Version to 1.28
>| March 2018 |
>+| | Update Skuid value to support Hex number
>| |
>+| | Add flexible PCD value format into spec
>| |
>+| | Add syntax to support SKU ID inherit from another SKU ID
>| |
>+| | Add DefaultStores section to describe the default setting
>| |
>+| | Add structure PCD field value assignment syntax
>| |
>diff --git a/SUMMARY.md b/SUMMARY.md
>index 873a52b..980589b 100644
>--- a/SUMMARY.md
>+++ b/SUMMARY.md
>@@ -61,10 +61,11 @@
> * [3.8 [Libraries]
>Sections](3_edk_ii_dsc_file_format/38_[libraries]_sections.md#38-libraries-
>sections)
> * [3.9 [LibraryClasses]
>Sections](3_edk_ii_dsc_file_format/39_[libraryclasses]_sections.md#39-
>libraryclasses-sections)
> * [3.10 PCD Sections](3_edk_ii_dsc_file_format/310_pcd_sections.md#310-
>pcd-sections)
> * [3.11 [Components]
>Sections](3_edk_ii_dsc_file_format/311_[components]_sections.md#311-
>components-sections)
> * [3.12 [UserExtensions]
>Sections](3_edk_ii_dsc_file_format/312_[userextensions]_sections.md#312-
>userextensions-sections)
>+ * [3.13 [DefaultStores]
>Sections](3_edk_ii_dsc_file_format/313_[defaultstores]_sections.md#313-
>defaultstores-sections)
> * [Appendix A Variables](appendix_a_variables.md#appendix-a-variables)
> * [Appendix B Sample EDK II DSC
>File](appendix_b_sample_edk_ii_dsc_file.md#appendix-b-sample-edk-ii-dsc-
>file)
> * [Appendix C Module Types](appendix_c_module_types.md#appendix-c-
>module-types)
> * [Appendix D Vpd Data
>Files](appendix_d_vpd_data_files/README.md#appendix-d-vpd-data-files)
> * [D.1 EDK II Build System Output File
>Format](appendix_d_vpd_data_files/d1_edk_ii_build_system_output_file_f
>ormat.md#d1-edk-ii-build-system-output-file-format)
>diff --git a/appendix_b_sample_edk_ii_dsc_file.md
>b/appendix_b_sample_edk_ii_dsc_file.md
>index fbde4a6..dc5e42e 100644
>--- a/appendix_b_sample_edk_ii_dsc_file.md
>+++ b/appendix_b_sample_edk_ii_dsc_file.md
>@@ -1,9 +1,9 @@
> <!--- @file
> Appendix B Sample EDK II DSC File
>
>- Copyright (c) 2006-2017, Intel Corporation. All rights reserved.<BR>
>+ Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
>
> Redistribution and use in source (original document form) and 'compiled'
> forms (converted to PDF, epub, HTML and other formats) with or without
> modification, are permitted provided that the following conditions are met:
>
>@@ -70,11 +70,11 @@ DSC file is not permitted.
>
>###########################################################
>#############
> [Defines]
> PLATFORM_NAME = NT32
> PLATFORM_GUID = EB216561-961F-47EE-9EF9-CA426EF547C2
> PLATFORM_VERSION = 0.5
>- DSC_SPECIFICATION = 0x0001001B
>+ DSC_SPECIFICATION = 0x0001001C
> OUTPUT_DIRECTORY = Build/NT32
> SUPPORTED_ARCHITECTURES = IA32
> BUILD_TARGETS = DEBUG|RELEASE
> SKUID_IDENTIFIER = DEFAULT
> FLASH_DEFINITION = Nt32Pkg/Nt32Pkg.fdf
>--
>2.6.1.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
