diff options
| author | Milo Casagrande <milo.casagrande@linaro.org> | 2014-11-24 16:02:34 +0100 |
|---|---|---|
| committer | Milo Casagrande <milo.casagrande@linaro.org> | 2014-11-24 16:02:34 +0100 |
| commit | 4e311eb42de6e79895980ac7bd7c1944a764c6ac (patch) | |
| tree | 8c2dcddc5c73397ade8e792dcee4b1152fcba043 /doc | |
| parent | 0b074a4ac047561aca459cf750f2ee178d988704 (diff) | |
doc: Fix boot and defconfig schema.
Change-Id: I0f287f4e3047ac27bb8bb0e2d24fab2de15924de
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/schema-boot.rst | 2 | ||||
| -rw-r--r-- | doc/schema-defconfig.rst | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/doc/schema-boot.rst b/doc/schema-boot.rst index fd23f3c..97c96cd 100644 --- a/doc/schema-boot.rst +++ b/doc/schema-boot.rst @@ -317,7 +317,7 @@ have when sent to the server. Notes +++++ -* ``defconfig_full``: This field should be used to specify the entire defconfig used if config fragments have been used and it should not contain the architecture (``arch``) value. Its value should conform to: ``defconfig[+fragment[+fragment ... ]]`` +* ``defconfig_full``: This field should be used to specify the entire defconfig used if config fragments have been used. It should not contain the architecture (``arch``) value. If not defined, the ``defconfig`` value will be used. Its value should conform to: ``defconfig[+fragment[+fragment ... ]]``. More Info ********* diff --git a/doc/schema-defconfig.rst b/doc/schema-defconfig.rst index 0985d8c..3fd7a79 100644 --- a/doc/schema-defconfig.rst +++ b/doc/schema-defconfig.rst @@ -4,9 +4,7 @@ defconfig --------- A defconfig ``name`` is composed of the job, kernel and defconfig values: -``job``-``kernel``-``defconfig``. - -At a lower level the ``defconfig`` is the directory resulting from a kernel build using a defconfig. +``job``-``kernel``-``defconfig_full``. .. _schema_defconfig_get: @@ -300,7 +298,7 @@ server. Notes +++++ -* ``defconfig_full``: This field should be used to specify the entire defconfig used if config fragments have been used and it should not contain the architecture (``arch``) value. Its value should conform to: ``defconfig[+fragment[+fragment ... ]]`` +* ``defconfig_full``: This field should be used to specify the entire defconfig used if config fragments have been used. It should not contain the architecture (``arch``) value. If not defined, the ``defconfig`` value will be used. Its value should conform to: ``defconfig[+fragment[+fragment ... ]]``. More Info ********* |