Skip to contentSkip to conversation

boot/uboot: introduce BR2_TARGET_UBOOT_NEEDS_XXD

PATCH New Titouan Christophe 2 participants 2 messages Jan 24, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 boot/uboot: introduce BR2_TARGET_UBOOT_NEEDS_XXD

When compiling uboot with a default environment built from a text file [1], the build pipeline uses the xxd command [2].

xxd is distributed with vim [3], which might no be installed on the host, so we provide this "uboot needs xxd" option to install host-vim for such a case.

[1] https://gitlab.denx.de/u-boot/u-boot/-/blob/v2021.01/env/Kconfig#L612-628
[2] https://gitlab.denx.de/u-boot/u-boot/-/blob/v2021.01/Makefile#L1887-1893
[3] https://github.com/vim/vim/tree/v8.2.0000/src/xxd

---
 boot/uboot/Config.in | 8 ++++++++
 boot/uboot/uboot.mk  | 4 ++++
 2 files changed, 12 insertions(+)
boot/uboot/Config.in +8 -0
index d43c85cce7..5b91d23a81 100644
@@ -239,6 +239,14 @@ config BR2_TARGET_UBOOT_NEEDS_OPENSBI
 	  and that the OpenSBI variable pointing to OpenSBI binary,
 	  is passed during the Buildroot build.
 
+config BR2_TARGET_UBOOT_NEEDS_XXD
+	bool "U-Boot needs xxd"
+	help
+	  Select this option if your U-Boot board configuration
+	  requires xxd to be available on the host. This is typically
+	  the case when the board configuration has USE_DEFAULT_ENV_FILE
+	  enabled.
+
 menu "U-Boot binary format"
 
 config BR2_TARGET_UBOOT_FORMAT_AIS
boot/uboot/uboot.mk +4 -0
index 2478a2a1e9..3afed94dbe 100644
@@ -198,6 +198,10 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_LZOP),y)
 UBOOT_DEPENDENCIES += host-lzop
 endif
 
+ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y)
+UBOOT_DEPENDENCIES += host-vim
+endif
+
 # prior to u-boot 2013.10 the license info was in COPYING. Copy it so
 # legal-info finds it
 define UBOOT_COPY_OLD_LICENSE_FILE
Signature · 1 line
2.25.3
#1 lore raw

PATCH 1/1 boot/uboot: introduce BR2_TARGET_UBOOT_NEEDS_XXD

Titouan, All,

On 2021-01-24 10:43 +0100, Titouan Christophe spake thusly:

Quoted 6 lines

When compiling uboot with a default environment built from a text file [1], the build pipeline uses the xxd command [2].

xxd is distributed with vim [3], which might no be installed on the host, so we provide this "uboot needs xxd" option to install host-vim for such a case.

This really is a big hammer.

On a lot of systems, vim is readily installed, and thus xxd will also be installed. And on some systems, xxd is not provided by vim but by a dedicated package (aptly named xxd on Ubuntu for example)

Also, it is very common for uboot configurations to indeed embed a default environment script.

Bulding host-vim (and its depedency, host-ncurses) takes roughly 1 min here, so it is not totally transparent...

Could we use a trick like we have for, say, tar, and only resort to building our hown host-vim if xxd is missing?

Regards,
Yann E. MORIN.

Quoted 51 lines

[1] https://gitlab.denx.de/u-boot/u-boot/-/blob/v2021.01/env/Kconfig#L612-628
[2] https://gitlab.denx.de/u-boot/u-boot/-/blob/v2021.01/Makefile#L1887-1893
[3] https://github.com/vim/vim/tree/v8.2.0000/src/xxd

---
 boot/uboot/Config.in | 8 ++++++++
 boot/uboot/uboot.mk  | 4 ++++
 2 files changed, 12 insertions(+)
boot/uboot/Config.in +8 -0
index d43c85cce7..5b91d23a81 100644
@@ -239,6 +239,14 @@ config BR2_TARGET_UBOOT_NEEDS_OPENSBI
 	  and that the OpenSBI variable pointing to OpenSBI binary,
 	  is passed during the Buildroot build.
 
+config BR2_TARGET_UBOOT_NEEDS_XXD
+	bool "U-Boot needs xxd"
+	help
+	  Select this option if your U-Boot board configuration
+	  requires xxd to be available on the host. This is typically
+	  the case when the board configuration has USE_DEFAULT_ENV_FILE
+	  enabled.
+
 menu "U-Boot binary format"
 
 config BR2_TARGET_UBOOT_FORMAT_AIS
boot/uboot/uboot.mk +4 -0
index 2478a2a1e9..3afed94dbe 100644
@@ -198,6 +198,10 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_LZOP),y)
 UBOOT_DEPENDENCIES += host-lzop
 endif
 
+ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y)
+UBOOT_DEPENDENCIES += host-vim
+endif
+
 # prior to u-boot 2013.10 the license info was in COPYING. Copy it so
 # legal-info finds it
 define UBOOT_COPY_OLD_LICENSE_FILE
Signature · 6 lines
2.25.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'