diff options
| author | Alexander Stein <alexander.stein@systec-electronic.com> | 2014-09-29 09:08:38 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-10-17 09:59:52 +0200 |
| commit | 330da573af09daa810f8e91cbed3d49c91bbded5 (patch) | |
| tree | cb48c93713bedb8aba3518a7fbc064cde234a59e /rules | |
| parent | d8a55123c8f0d63f6e12a965244e4e25210f5133 (diff) | |
| download | ptxdist-330da573af09daa810f8e91cbed3d49c91bbded5.tar.gz ptxdist-330da573af09daa810f8e91cbed3d49c91bbded5.tar.xz | |
u-boot-tools: Update to version 2014.07
This updates the u-boot tools to 2014.07, where fw_printenv/fw_setenv
also support MMC devices.
The now somewhat changed build system always need a target configured. So
use sandbox as dummy. Now it is not possible to build mkimage for the
target. So remove that from Kconfig.
Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/host-u-boot-tools.make | 2 | ||||
| -rw-r--r-- | rules/u-boot-tools.in | 10 | ||||
| -rw-r--r-- | rules/u-boot-tools.make | 16 |
3 files changed, 7 insertions, 21 deletions
diff --git a/rules/host-u-boot-tools.make b/rules/host-u-boot-tools.make index 27543f9b7..d7864182b 100644 --- a/rules/host-u-boot-tools.make +++ b/rules/host-u-boot-tools.make @@ -19,7 +19,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 := tools +HOST_U_BOOT_TOOLS_MAKE_OPT := sandbox_config tools # ---------------------------------------------------------------------------- # Install diff --git a/rules/u-boot-tools.in b/rules/u-boot-tools.in index b02ded509..76ed28a04 100644 --- a/rules/u-boot-tools.in +++ b/rules/u-boot-tools.in @@ -5,18 +5,10 @@ menuconfig U_BOOT_TOOLS prompt "u-boot-tools " help some helpful tools from U-Boot project. Most important tool in - this section is mkimage to generate U-Boot boot images. + this section is fw_printenv/fw_setenv to read/write U-Boot settings. if U_BOOT_TOOLS -config U_BOOT_TOOLS_TOOL_MKIMAGE - tristate - default y - prompt "mkimage" - help - the U-Boot mkimage command is used to create boot images for - the U-Boot bootloader. - config U_BOOT_TOOLS_TOOL_ENV tristate default n diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make index 29a912c42..350175aeb 100644 --- a/rules/u-boot-tools.make +++ b/rules/u-boot-tools.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools # # Paths and names # -U_BOOT_TOOLS_VERSION := 2011.12 -U_BOOT_TOOLS_MD5 := 7f29b9f6da44d6e46e988e7561fd1d5f +U_BOOT_TOOLS_VERSION := 2014.07 +U_BOOT_TOOLS_MD5 := 36d4bad687edcafa396fee607e505d4e U_BOOT_TOOLS := u-boot-$(U_BOOT_TOOLS_VERSION) U_BOOT_TOOLS_SUFFIX := tar.bz2 U_BOOT_TOOLS_URL := http://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX) @@ -30,10 +30,10 @@ U_BOOT_TOOLS_LICENSE := GPLv2 # ---------------------------------------------------------------------------- U_BOOT_TOOLS_CONF_TOOL := NO +# just pick sandbox as a dummy target config U_BOOT_TOOLS_MAKE_OPT := \ - HOSTCC="$(CROSS_CC)" \ - HOSTSTRIP="$(CROSS_STRIP)" \ - tools + CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ + sandbox_config tools ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV U_BOOT_TOOLS_MAKE_OPT += env @@ -45,8 +45,6 @@ endif $(STATEDIR)/u-boot-tools.install: @$(call targetinfo) - install -D $(U_BOOT_TOOLS_DIR)/tools/mkimage \ - $(U_BOOT_TOOLS_PKGDIR)/usr/bin/mkimage ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV install -D $(U_BOOT_TOOLS_DIR)/tools/env/fw_printenv \ $(U_BOOT_TOOLS_PKGDIR)/usr/sbin/fw_printenv @@ -67,10 +65,6 @@ $(STATEDIR)/u-boot-tools.targetinstall: "Andreas Bießmann <andreas@biessmann.de>") @$(call install_fixup, u-boot-tools,DESCRIPTION,missing) -ifdef PTXCONF_U_BOOT_TOOLS_TOOL_MKIMAGE - @$(call install_copy, u-boot-tools, 0, 0, 0755, -, /usr/bin/mkimage) -endif - ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV @$(call install_copy, u-boot-tools, 0, 0, 0755, -, /usr/sbin/fw_printenv) @$(call install_link, u-boot-tools, fw_printenv, /usr/sbin/fw_setenv) |