diff mbox series

[1/1] boot/uboot/: Name U-Boot boot script image

Message ID LRqYEr-8n8UCFItcyNs3C7MB6QE2qjqOzG6oeXtPjF0qV_bhTXsJ2-mD4NDoS9Ro4UsvpwIh8HK5vcnjj87xxjS8QVNoFCyX9WMEBOu17As=@protonmail.com
State New
Headers show
Series [1/1] boot/uboot/: Name U-Boot boot script image | expand

Commit Message

Yair Ben-Avraham June 23, 2020, 11:04 p.m. UTC
Signed-off-by: Yair Ben Avraham <yairba@protonmail.com>
---
 boot/uboot/Config.in | 5 +++++
 boot/uboot/uboot.mk  | 1 +
 2 files changed, 6 insertions(+)

--
2.20.1

Comments

Yann E. MORIN June 24, 2020, 8:21 p.m. UTC | #1
Yair, All,

On 2020-06-23 23:04 +0000, Yair Ben-Avraham spake thusly:
> Signed-off-by: Yair Ben Avraham <yairba@protonmail.com>
> ---
>  boot/uboot/Config.in | 5 +++++
>  boot/uboot/uboot.mk  | 1 +
>  2 files changed, 6 insertions(+)
> 
> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
> index 8cce9b1bae..310c4f8186 100644
> --- a/boot/uboot/Config.in
> +++ b/boot/uboot/Config.in
> @@ -568,6 +568,11 @@ config BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE
>         help
>           Source file to generate the U-Boot boot script.
> 
> +config BR2_TARGET_UBOOT_BOOT_SCRIPT_IMAGE_NAME
> +       string "U-Boot boot script image name"
> +       help
> +         Image (*not* file) name.
> +
>  endif
> 
>  if BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG
> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> index 71689207e3..ab945eb159 100644
> --- a/boot/uboot/uboot.mk
> +++ b/boot/uboot/uboot.mk
> @@ -340,6 +340,7 @@ define UBOOT_INSTALL_IMAGES_CMDS
>         $(UBOOT_GENERATE_ENV_IMAGE)
>         $(if $(BR2_TARGET_UBOOT_BOOT_SCRIPT),
>                 $(MKIMAGE) -C none -A $(MKIMAGE_ARCH) -T script \
> +                       -n $(BR2_TARGET_UBOOT_BOOT_SCRIPT_IMAGE_NAME) \

So, when the user does not set the option, we will end up passing:

    -n ""

Is that correct?

Regards,
Yann E. MORIN.

>                         -d $(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)) \
>                         $(BINARIES_DIR)/boot.scr)
>  endef
> --
> 2.20.1
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Yair Ben-Avraham July 6, 2020, 4:11 a.m. UTC | #2
Hi Yann,

Not elegant, but yes. Anyway an empty string is the default in case no image name is mentioned.

See u-boot/tools/mkimage.c  static struct image_tool_params params

Yair
--
Yair Ben-Avraham
yairba@protonmail.com
+31.6.1316.5535

‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Wednesday, June 24, 2020 10:21 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:

> Yair, All,
>
> On 2020-06-23 23:04 +0000, Yair Ben-Avraham spake thusly:
>
> > Signed-off-by: Yair Ben Avraham yairba@protonmail.com
> >
> > ------------------------------------------------------
> >
> > boot/uboot/Config.in | 5 +++++
> > boot/uboot/uboot.mk | 1 +
> > 2 files changed, 6 insertions(+)
> > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
> > index 8cce9b1bae..310c4f8186 100644
> > --- a/boot/uboot/Config.in
> > +++ b/boot/uboot/Config.in
> > @@ -568,6 +568,11 @@ config BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE
> > help
> > Source file to generate the U-Boot boot script.
> > +config BR2_TARGET_UBOOT_BOOT_SCRIPT_IMAGE_NAME
> >
> > -         string "U-Boot boot script image name"
> >
> >
> > -         help
> >
> >
> > -           Image (*not* file) name.
> >
> >
> > -
> >
> > endif
> > if BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG
> > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> > index 71689207e3..ab945eb159 100644
> > --- a/boot/uboot/uboot.mk
> > +++ b/boot/uboot/uboot.mk
> > @@ -340,6 +340,7 @@ define UBOOT_INSTALL_IMAGES_CMDS
> > $(UBOOT_GENERATE_ENV_IMAGE)
> > $(if $(BR2_TARGET_UBOOT_BOOT_SCRIPT),
> > $(MKIMAGE) -C none -A $(MKIMAGE_ARCH) -T script \
> >
> > -                         -n $(BR2_TARGET_UBOOT_BOOT_SCRIPT_IMAGE_NAME) \\
> >
> >
>
> So, when the user does not set the option, we will end up passing:
>
> -n ""
>
> Is that correct?
>
> Regards,
> Yann E. MORIN.
>
> >                         -d $(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)) \\
> >                         $(BINARIES_DIR)/boot.scr)
> >
> >
> > endef
> >
> > ------
> >
> > 2.20.1
> >
> > buildroot mailing list
> > buildroot@busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
>
> --
>
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | /*\ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
diff mbox series

Patch

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 8cce9b1bae..310c4f8186 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -568,6 +568,11 @@  config BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE
        help
          Source file to generate the U-Boot boot script.

+config BR2_TARGET_UBOOT_BOOT_SCRIPT_IMAGE_NAME
+       string "U-Boot boot script image name"
+       help
+         Image (*not* file) name.
+
 endif

 if BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 71689207e3..ab945eb159 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -340,6 +340,7 @@  define UBOOT_INSTALL_IMAGES_CMDS
        $(UBOOT_GENERATE_ENV_IMAGE)
        $(if $(BR2_TARGET_UBOOT_BOOT_SCRIPT),
                $(MKIMAGE) -C none -A $(MKIMAGE_ARCH) -T script \
+                       -n $(BR2_TARGET_UBOOT_BOOT_SCRIPT_IMAGE_NAME) \
                        -d $(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)) \
                        $(BINARIES_DIR)/boot.scr)
 endef