diff mbox series

[16/17] ref-manual: document UBOOT_MAKE_OPTS

Message ID 20251016-release-note-5-3-second-hunk-v1-16-20f21db1f93c@bootlin.com
State New
Headers show
Series Updates for 5.3 | expand

Commit Message

Antonin Godard Oct. 16, 2025, 8:54 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   | 9 +++++++--
 documentation/ref-manual/variables.rst | 4 ++++
 2 files changed, 11 insertions(+), 2 deletions(-)

Comments

Quentin Schulz Oct. 16, 2025, 10:56 a.m. UTC | #1
Hi Antonin,

On 10/16/25 10:54 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   | 9 +++++++--
>   documentation/ref-manual/variables.rst | 4 ++++
>   2 files changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/documentation/ref-manual/classes.rst b/documentation/ref-manual/classes.rst
> index 4d74563e1..c22d3b712 100644
> --- a/documentation/ref-manual/classes.rst
> +++ b/documentation/ref-manual/classes.rst
> @@ -3233,8 +3233,8 @@ The :ref:`ref-classes-uboot-config` class provides support for U-Boot configurat
>   a machine. Specify the machine in your recipe with configuration entries::
>   
>      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"
>   
>   The above options correspond to:
>   
> @@ -3266,6 +3266,11 @@ The above options correspond to:
>      This option is not mandatory, but the value of :term:`UBOOT_BINARY` is used
>      instead and should be set.
>   
> +-  ``makeopts``: the additional options passed to ``make`` when compiling U-boot
> +   for this configuration entry. This does not replace the original value of
> +   :term:`UBOOT_MAKE_OPTS`. The options in this entry are added as additional
> +   options after :term:`UBOOT_MAKE_OPTS`.

The last two sentences are redundant, just keep the last one.

Also, it is **before** :term:`UBOOT_MAKE_OPTS`, c.f.

oe_runmake -C ${S} O=${B}/${config} ${config_make_opts} 
${UBOOT_MAKE_OPTS} ${config}
oe_runmake -C ${S} O=${B}/${config} ${config_make_opts} 
${UBOOT_MAKE_OPTS} ${UBOOT_MAKE_TARGET}

Cheers,
Quentin
diff mbox series

Patch

diff --git a/documentation/ref-manual/classes.rst b/documentation/ref-manual/classes.rst
index 4d74563e1..c22d3b712 100644
--- a/documentation/ref-manual/classes.rst
+++ b/documentation/ref-manual/classes.rst
@@ -3233,8 +3233,8 @@  The :ref:`ref-classes-uboot-config` class provides support for U-Boot configurat
 a machine. Specify the machine in your recipe with configuration entries::
 
    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"
 
 The above options correspond to:
 
@@ -3266,6 +3266,11 @@  The above options correspond to:
    This option is not mandatory, but the value of :term:`UBOOT_BINARY` is used
    instead and should be set.
 
+-  ``makeopts``: the additional options passed to ``make`` when compiling U-boot
+   for this configuration entry. This does not replace the original value of
+   :term:`UBOOT_MAKE_OPTS`. The options in this entry are added as additional
+   options after :term:`UBOOT_MAKE_OPTS`.
+
 You can also specify the defconfig used during the build using this method::
 
    UBOOT_MACHINE = "config"
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst
index 140be47a9..709cc5726 100644
--- a/documentation/ref-manual/variables.rst
+++ b/documentation/ref-manual/variables.rst
@@ -10894,6 +10894,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".