diff mbox series

[v2,15/16] ref-manual: document UBOOT_MAKE_OPTS

Message ID 20251024-release-note-5-3-second-hunk-v2-15-d15dabc095d0@bootlin.com
State Under Review
Headers show
Series Updates for 5.3 | expand

Commit Message

Antonin Godard Oct. 24, 2025, 8:20 a.m. UTC
This variable was added by commit 3338330e0c46 ("u-boot: Add specifying
make options as part the config looping") in OE-Core. Document how to
use the option in UBOOT_CONFIG.

Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
---
 documentation/ref-manual/classes.rst   | 13 ++++++-------
 documentation/ref-manual/variables.rst |  4 ++++
 2 files changed, 10 insertions(+), 7 deletions(-)

Comments

Quentin Schulz Oct. 24, 2025, 3:54 p.m. UTC | #1
Hi Antonin,

On 10/24/25 10:20 AM, Antonin Godard via lists.yoctoproject.org wrote:
> This variable was added by commit 3338330e0c46 ("u-boot: Add specifying
> make options as part the config looping") in OE-Core. Document how to
> use the option in UBOOT_CONFIG.
> 
> Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
> ---
>   documentation/ref-manual/classes.rst   | 13 ++++++-------
>   documentation/ref-manual/variables.rst |  4 ++++
>   2 files changed, 10 insertions(+), 7 deletions(-)
> 
> diff --git a/documentation/ref-manual/classes.rst b/documentation/ref-manual/classes.rst
> index 60529ef9f..a0089c415 100644
> --- a/documentation/ref-manual/classes.rst
> +++ b/documentation/ref-manual/classes.rst
> @@ -3240,8 +3240,8 @@ There are two ways to configure the recipe for your machine:
>   -  Using :term:`UBOOT_CONFIG` variable. For example::
>   
>         UBOOT_CONFIG ??= "foo bar"
> -      UBOOT_CONFIG[foo] = "config,images,binary"
> -      UBOOT_CONFIG[bar] = "config2,images2,binary2"
> +      UBOOT_CONFIG[foo] = "config,images,binary,makeopts"
> +      UBOOT_CONFIG[bar] = "config2,images2,binary2,makeopts2"
>   
>      In this example, all possible configurations are selected (``foo`` and
>      ``bar``), but it is also possible to build only ``foo`` or ``bar`` by
> @@ -3272,13 +3272,12 @@ There are two ways to configure the recipe for your machine:
>            u-boot.bin
>            u-boot-with-spl.bin
>   
> -      Setting the ``binary`` value to ``u-boot-with-spl.bin`` will make this
> -      binary the one deployed in :term:`DEPLOY_DIR_IMAGE`. It is renamed to
> -      include the build configuration name in the process (``foo`` or ``bar`` in
> -      the above example).
> -
>         This option defaults to :term:`UBOOT_BINARY` if unset.
>   
> +   -  ``makeopts``: the additional options passed to ``make`` when compiling U-boot

and configuring. c.f. meta/recipes-bsp/u-boot/u-boot-configure.inc

> +      for this configuration entry. The options in this entry are added before
> +      the options in :term:`UBOOT_MAKE_OPTS`.
> +
>   -  Or, using the :term:`UBOOT_MACHINE` variable (and its companion variable
>      :term:`UBOOT_BINARY`). For example::
>   
> diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst
> index d249ca383..6aba20d52 100644
> --- a/documentation/ref-manual/variables.rst
> +++ b/documentation/ref-manual/variables.rst
> @@ -10842,6 +10842,10 @@ system and gives an overview of their function and contents.
>         Please see the "Selection of Processor Architecture and Board Type"
>         section in the U-Boot README for valid values for this variable.
>   
> +   :term:`UBOOT_MAKE_OPTS`
> +      The :term:`UBOOT_MAKE_OPTS` variable can be used to pass extra options to
> +      ``make`` when U-boot is compiled.
> +

Ditto.

Cheers,
Quentin
diff mbox series

Patch

diff --git a/documentation/ref-manual/classes.rst b/documentation/ref-manual/classes.rst
index 60529ef9f..a0089c415 100644
--- a/documentation/ref-manual/classes.rst
+++ b/documentation/ref-manual/classes.rst
@@ -3240,8 +3240,8 @@  There are two ways to configure the recipe for your machine:
 -  Using :term:`UBOOT_CONFIG` variable. For example::
 
       UBOOT_CONFIG ??= "foo bar"
-      UBOOT_CONFIG[foo] = "config,images,binary"
-      UBOOT_CONFIG[bar] = "config2,images2,binary2"
+      UBOOT_CONFIG[foo] = "config,images,binary,makeopts"
+      UBOOT_CONFIG[bar] = "config2,images2,binary2,makeopts2"
 
    In this example, all possible configurations are selected (``foo`` and
    ``bar``), but it is also possible to build only ``foo`` or ``bar`` by
@@ -3272,13 +3272,12 @@  There are two ways to configure the recipe for your machine:
          u-boot.bin
          u-boot-with-spl.bin
 
-      Setting the ``binary`` value to ``u-boot-with-spl.bin`` will make this
-      binary the one deployed in :term:`DEPLOY_DIR_IMAGE`. It is renamed to
-      include the build configuration name in the process (``foo`` or ``bar`` in
-      the above example).
-
       This option defaults to :term:`UBOOT_BINARY` if unset.
 
+   -  ``makeopts``: the additional options passed to ``make`` when compiling U-boot
+      for this configuration entry. The options in this entry are added before
+      the options in :term:`UBOOT_MAKE_OPTS`.
+
 -  Or, using the :term:`UBOOT_MACHINE` variable (and its companion variable
    :term:`UBOOT_BINARY`). For example::
 
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst
index d249ca383..6aba20d52 100644
--- a/documentation/ref-manual/variables.rst
+++ b/documentation/ref-manual/variables.rst
@@ -10842,6 +10842,10 @@  system and gives an overview of their function and contents.
       Please see the "Selection of Processor Architecture and Board Type"
       section in the U-Boot README for valid values for this variable.
 
+   :term:`UBOOT_MAKE_OPTS`
+      The :term:`UBOOT_MAKE_OPTS` variable can be used to pass extra options to
+      ``make`` when U-boot is compiled.
+
    :term:`UBOOT_MAKE_TARGET`
       Specifies the target called in the ``Makefile``. The default target
       is "all".