diff options
-rw-r--r-- | documentation/dev-manual/dev-manual-common-tasks.xml | 23 | ||||
-rw-r--r-- | documentation/ref-manual/ref-variables.xml | 4 |
2 files changed, 16 insertions, 11 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml index 3f82351e17..0dddb8b3bb 100644 --- a/documentation/dev-manual/dev-manual-common-tasks.xml +++ b/documentation/dev-manual/dev-manual-common-tasks.xml | |||
@@ -5420,12 +5420,16 @@ | |||
5420 | <literallayout class='monospaced'> | 5420 | <literallayout class='monospaced'> |
5421 | BBMULTICONFIG = "x86 arm" | 5421 | BBMULTICONFIG = "x86 arm" |
5422 | </literallayout> | 5422 | </literallayout> |
5423 | </para> | 5423 | <note> |
5424 | 5424 | A "default" configuration already exists by | |
5425 | <para>Please note, that a "default" configuration already exists by definition, | 5425 | definition. |
5426 | this configuration is named: "" (empty string) and is defined by the variables | 5426 | This configuration is named: "" (i.e. empty |
5427 | coming from your local.conf file. So, the previous example actually adds two | 5427 | string) and is defined by the variables coming |
5428 | additional configurations to your build "arm" and "x86" along with "". | 5428 | from your <filename>local.conf</filename> file. |
5429 | Consequently, the previous example actually | ||
5430 | adds two additional configurations to your | ||
5431 | build: "arm" and "x86" along with "". | ||
5432 | </note> | ||
5429 | </para></listitem> | 5433 | </para></listitem> |
5430 | <listitem><para> | 5434 | <listitem><para> |
5431 | <emphasis>Launch BitBake</emphasis>: | 5435 | <emphasis>Launch BitBake</emphasis>: |
@@ -5445,9 +5449,10 @@ | |||
5445 | <filename>x86.conf</filename> configuration file, | 5449 | <filename>x86.conf</filename> configuration file, |
5446 | a <filename>core-image-sato</filename> | 5450 | a <filename>core-image-sato</filename> |
5447 | image that is configured through the | 5451 | image that is configured through the |
5448 | <filename>arm.conf</filename> configuration file and a | 5452 | <filename>arm.conf</filename> configuration file |
5449 | <filename>core-image-base</filename> that is configured | 5453 | and a <filename>core-image-base</filename> that is |
5450 | through your <filename>local.conf</filename> configuration file. | 5454 | configured through your |
5455 | <filename>local.conf</filename> configuration file. | ||
5451 | </para></listitem> | 5456 | </para></listitem> |
5452 | </itemizedlist> | 5457 | </itemizedlist> |
5453 | <note> | 5458 | <note> |
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml index 8ad3f9b3ca..b5152b2a3d 100644 --- a/documentation/ref-manual/ref-variables.xml +++ b/documentation/ref-manual/ref-variables.xml | |||
@@ -1349,8 +1349,8 @@ | |||
1349 | <glossdef> | 1349 | <glossdef> |
1350 | <para role="glossdeffirst"> | 1350 | <para role="glossdeffirst"> |
1351 | <!-- <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> --> | 1351 | <!-- <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> --> |
1352 | Specifies each additional separate configuration when you are | 1352 | Specifies each additional separate configuration when you |
1353 | building targets with multiple configurations. | 1353 | are building targets with multiple configurations. |
1354 | Use this variable in your | 1354 | Use this variable in your |
1355 | <filename>conf/local.conf</filename> configuration file. | 1355 | <filename>conf/local.conf</filename> configuration file. |
1356 | Specify a <replaceable>multiconfigname</replaceable> for | 1356 | Specify a <replaceable>multiconfigname</replaceable> for |