diff options
| author | Jörg Krause <joerg.krause@embedded.rocks> | 2020-01-23 09:06:51 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2020-01-24 20:25:56 +0100 |
| commit | 8258a60ad403d8e2637bd1226ec43863e4160726 (patch) | |
| tree | 8569d6408bade0f7ddd41a2dca8feee3b601f554 | |
| parent | e233ec030b23c0b58cbc3799b6acd49e61fcd3ee (diff) | |
| download | buildroot-8258a60ad403d8e2637bd1226ec43863e4160726.tar.bz2 | |
package/uboot-tools: bump to version 2020.01
Also:
* Regenerate patch 0002 so it applies without fuzz.
* Add patch 0003, which drops generated/autoconf.h from imximage as we
need uboot-tools without a board configuration.
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
4 files changed, 39 insertions, 3 deletions
diff --git a/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch b/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch index 33a79b16af..a376afbc75 100644 --- a/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch +++ b/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch @@ -28,7 +28,7 @@ diff --git a/Makefile b/Makefile index 6aa08964ff..fcec83d183 100644 --- a/Makefile +++ b/Makefile -@@ -443,7 +443,7 @@ defaultenv_h := include/generated/defaultenv_autogenerated.h +@@ -486,7 +486,7 @@ defaultenv_h := include/generated/defaultenv_autogenerated.h no-dot-config-targets := clean clobber mrproper distclean \ help %docs check% coccicheck \ diff --git a/package/uboot-tools/0003-drop-autoconf.h-from-tools.patch b/package/uboot-tools/0003-drop-autoconf.h-from-tools.patch new file mode 100644 index 0000000000..09ee40bec0 --- /dev/null +++ b/package/uboot-tools/0003-drop-autoconf.h-from-tools.patch @@ -0,0 +1,36 @@ +From 0552a8ffdfbb9807fcef4498011907caa5de2ace Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> +Date: Thu, 9 Jan 2020 15:11:32 +0100 +Subject: [PATCH] drop autoconf.h from tools +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We need to build u-boot tools without a board configuration for the target. + +imximage uses the DCD address from Kconfig to display this information +to the user. The default value for all i.MX platforms is 0x00910000, +except for i.MX7ULP, which has a DCD address of 0x2f010000. + +The default value printed before version 2020.01 was 0x00910000. + +Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> +--- + tools/imximage.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/tools/imximage.c b/tools/imximage.c +index d7edd3c52f..f8d21fa06a 100644 +--- a/tools/imximage.c ++++ b/tools/imximage.c +@@ -11,7 +11,6 @@ + #include "imagetool.h" + #include <image.h> + #include "imximage.h" +-#include <generated/autoconf.h> + + #define UNDEFINED 0xFFFFFFFF + +-- +2.25.0 + diff --git a/package/uboot-tools/uboot-tools.hash b/package/uboot-tools/uboot-tools.hash index 1dd2456449..6c17ef02b2 100644 --- a/package/uboot-tools/uboot-tools.hash +++ b/package/uboot-tools/uboot-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014 u-boot-2019.10.tar.bz2 +sha256 aa453c603208b1b27bd03525775a7f79b443adec577fdc6e8f06974025a135f1 u-boot-2020.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index f277a4c828..1f0bac5bf7 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2019.10 +UBOOT_TOOLS_VERSION = 2020.01 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPL-2.0+ |