mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Alexander Stein <alexander.stein@systec-electronic.com>
To: ptxdist@pengutronix.de
Cc: Alexander Stein <alexander.stein@systec-electronic.com>
Subject: [ptxdist] [PATCH 1/1] u-boot-tools: Update to version 2014.07
Date: Mon, 29 Sep 2014 09:08:38 +0200	[thread overview]
Message-ID: <1411974518-22075-1-git-send-email-alexander.stein@systec-electronic.com> (raw)

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>
---
 rules/host-u-boot-tools.make |  2 +-
 rules/u-boot-tools.in        | 10 +---------
 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 27543f9..d786418 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 b02ded5..76ed28a 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 29a912c..350175a 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)
-- 
1.8.5.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de

             reply	other threads:[~2014-09-29  7:07 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-29  7:08 Alexander Stein [this message]
2014-10-07 12:24 ` Alexander Stein
2014-11-13 16:40 ` Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1411974518-22075-1-git-send-email-alexander.stein@systec-electronic.com \
    --to=alexander.stein@systec-electronic.com \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox