@@ -7,6 +7,27 @@ config BR2_PACKAGE_UBOOT_TOOLS
if BR2_PACKAGE_UBOOT_TOOLS
+if BR2_TARGET_UBOOT
+
+choice
+ prompt "version"
+ default BR2_PACKAGE_UBOOT_TOOLS_LATEST_VERSION
+ help
+ Select the specific uboot-tools version you want to use
+
+config BR2_PACKAGE_UBOOT_TOOLS_LATEST_VERSION
+ bool "Use latest upstream version"
+
+config BR2_PACKAGE_UBOOT_TOOLS_USE_UBOOT_VERSION
+ bool "Use the same version as the uboot package"
+ help
+ You *MUST* use at least U-Boot 2014.04. Since then, changes happened in
+ the build infrastructur which lead to build breakage.
+
+endchoice
+
+endif
+
config BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE
bool "mkimage"
help
@@ -4,11 +4,24 @@
#
################################################################################
+ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_USE_UBOOT_VERSION),y)
+# We have to use the BR2_TARGET_UBOOT_VERSION because of the order of inclusion
+# of the mk files.
+UBOOT_TOOLS_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
+UBOOT_TOOLS_SOURCE = $(UBOOT_SOURCE)
+UBOOT_TOOLS_SITE = $(UBOOT_SITE)
+ifneq ($(UBOOT_SITE_METHOD),)
+UBOOT_TOOL_SITE_METHOD = $(UBOOT_SITE_METHOD)
+endif
+UBOOT_TOOLS_LICENSE = $(UBOOT_LICENSE)
+UBOOT_TOOLS_LICENSE_FILES = $(UBOOT_LICENSE_FILES)
+else
UBOOT_TOOLS_VERSION = 2014.07
UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot
UBOOT_TOOLS_LICENSE = GPLv2+
UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt
+endif
define UBOOT_TOOLS_BUILD_CMDS
$(MAKE) -C $(@D) \
If the user has specified a custom U-Boot repository, he may also want to use it for U-Boot tools. This could be usefull in two identified use case: - User want the same version for U-Boot tools and U-Boot - User has modified U-Boot tools in his U-Boot repository Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> --- Changes v2 -> v3: - Add a help on the choice option to warn users on the minimal version needed for U-Boot Changes v1 -> v2: - Add a choice option (Suggested by Luca Ceresoli) - Add an if/then/else structure (Suggested by Luca Ceresoli) - Take UBOOT_LICENSE and UBOOT_LICENCE_FILES into account (Suggested by Arnout Vandecappelle) --- package/uboot-tools/Config.in | 21 +++++++++++++++++++++ package/uboot-tools/uboot-tools.mk | 13 +++++++++++++ 2 files changed, 34 insertions(+)