[ptxdist] [PATCH] u-boot-tools: version bump 2019.01 -> 2020.04

[ptxdist] [PATCH] u-boot-tools: version bump 2019.01 -> 2020.04

[Michael Tretter]

The new U-Boot version has a tools-only_defconfig for building the
tools. Switch from the sandbox_defconfig to the tools-only defconfig.

The U-Boot tools do not actually build the sandbox U-Boot and therefore
SDL support (for display/keyboard) is definitely not needed. Disable SDL
to prevent the "sdl2-config: Command not found" messages when building
the tools.

Use the documented envtools top-level command to build the target tools
instead of calling the Makefile in the tools/env directory.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/host-u-boot-tools.make |  2 +-
 rules/u-boot-tools.make      | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/rules/host-u-boot-tools.make b/rules/host-u-boot-tools.make
index c16f4b03fac2..3a980dd76667 100644
--- a/rules/host-u-boot-tools.make
+++ b/rules/host-u-boot-tools.make
@@ -17,7 +17,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_U_BOOT_TOOLS) += host-u-boot-tools
 # ----------------------------------------------------------------------------
 
 HOST_U_BOOT_TOOLS_CONF_TOOL	:= NO
-HOST_U_BOOT_TOOLS_MAKE_OPT	:= sandbox_config tools-only
+HOST_U_BOOT_TOOLS_MAKE_OPT	:= tools-only_defconfig tools-only NO_SDL=1
 
 # ----------------------------------------------------------------------------
 # Install
diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make
index 154040ff5510..21b17c527052 100644
--- a/rules/u-boot-tools.make
+++ b/rules/u-boot-tools.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools
 #
 # Paths and names
 #
-U_BOOT_TOOLS_VERSION	:= 2019.01
-U_BOOT_TOOLS_MD5	:= 0adbc6c755768f0b78a2a0decf0b253a
+U_BOOT_TOOLS_VERSION	:= 2020.04
+U_BOOT_TOOLS_MD5	:= 51113d2288c55110e33a895c65ab9f60
 U_BOOT_TOOLS		:= u-boot-$(U_BOOT_TOOLS_VERSION)
 U_BOOT_TOOLS_SUFFIX	:= tar.bz2
 U_BOOT_TOOLS_URL	:= https://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
@@ -31,19 +31,12 @@ U_BOOT_TOOLS_LICENSE_FILES := \
 # Prepare
 # ----------------------------------------------------------------------------
 
-
-# just pick sandbox as a dummy target config
-U_BOOT_TOOLS_CONFIG	:= sandbox_config
-ifdef PTXCONF_ARCH_PPC
-# the sandbox is not supported by PPC so just some random PPC config
-U_BOOT_TOOLS_CONFIG	:= MPC8308RDB_defconfig
-endif
-
 U_BOOT_TOOLS_CONF_TOOL	:= NO
 U_BOOT_TOOLS_MAKE_OPT	:= \
 	CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \
-	$(U_BOOT_TOOLS_CONFIG) \
-	tools/env/
+	tools-only_defconfig \
+	envtools \
+	NO_SDL=1
 
 # ----------------------------------------------------------------------------
 # Install
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [APPLIED] u-boot-tools: version bump 2019.01 -> 2020.04

[Michael Olbrich]

Thanks, applied as 647d9dcf1f8656f72601be6906200bc3e25ead8d.

Michael

[sent from post-receive hook]

On Mon, 04 May 2020 13:20:45 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote:
> The new U-Boot version has a tools-only_defconfig for building the
> tools. Switch from the sandbox_defconfig to the tools-only defconfig.
> 
> The U-Boot tools do not actually build the sandbox U-Boot and therefore
> SDL support (for display/keyboard) is definitely not needed. Disable SDL
> to prevent the "sdl2-config: Command not found" messages when building
> the tools.
> 
> Use the documented envtools top-level command to build the target tools
> instead of calling the Makefile in the tools/env directory.
> 
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20200414080249.8105-1-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/host-u-boot-tools.make b/rules/host-u-boot-tools.make
> index c16f4b03fac2..3a980dd76667 100644
> --- a/rules/host-u-boot-tools.make
> +++ b/rules/host-u-boot-tools.make
> @@ -17,7 +17,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_U_BOOT_TOOLS) += host-u-boot-tools
>  # ----------------------------------------------------------------------------
>  
>  HOST_U_BOOT_TOOLS_CONF_TOOL	:= NO
> -HOST_U_BOOT_TOOLS_MAKE_OPT	:= sandbox_config tools-only
> +HOST_U_BOOT_TOOLS_MAKE_OPT	:= tools-only_defconfig tools-only NO_SDL=1
>  
>  # ----------------------------------------------------------------------------
>  # Install
> diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make
> index 154040ff5510..21b17c527052 100644
> --- a/rules/u-boot-tools.make
> +++ b/rules/u-boot-tools.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools
>  #
>  # Paths and names
>  #
> -U_BOOT_TOOLS_VERSION	:= 2019.01
> -U_BOOT_TOOLS_MD5	:= 0adbc6c755768f0b78a2a0decf0b253a
> +U_BOOT_TOOLS_VERSION	:= 2020.04
> +U_BOOT_TOOLS_MD5	:= 51113d2288c55110e33a895c65ab9f60
>  U_BOOT_TOOLS		:= u-boot-$(U_BOOT_TOOLS_VERSION)
>  U_BOOT_TOOLS_SUFFIX	:= tar.bz2
>  U_BOOT_TOOLS_URL	:= https://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
> @@ -31,19 +31,12 @@ U_BOOT_TOOLS_LICENSE_FILES := \
>  # Prepare
>  # ----------------------------------------------------------------------------
>  
> -
> -# just pick sandbox as a dummy target config
> -U_BOOT_TOOLS_CONFIG	:= sandbox_config
> -ifdef PTXCONF_ARCH_PPC
> -# the sandbox is not supported by PPC so just some random PPC config
> -U_BOOT_TOOLS_CONFIG	:= MPC8308RDB_defconfig
> -endif
> -
>  U_BOOT_TOOLS_CONF_TOOL	:= NO
>  U_BOOT_TOOLS_MAKE_OPT	:= \
>  	CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \
> -	$(U_BOOT_TOOLS_CONFIG) \
> -	tools/env/
> +	tools-only_defconfig \
> +	envtools \
> +	NO_SDL=1
>  
>  # ----------------------------------------------------------------------------
>  # Install

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de