# ChangeLog for dev-embedded/u-boot-tools
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/ChangeLog,v 1.19 2011/10/14 22:29:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/ChangeLog,v 1.20 2011/10/14 22:29:35 vapier Exp $
+
+*u-boot-tools-2011.09 (14 Oct 2011)
+
+ 14 Oct 2011; Mike Frysinger <vapier@gentoo.org>
+ +files/2011.09/0001-Build-timestamp_autogenerated.h-without-config.patch,
+ +files/2011.09/0002-Safer-timestamp_autogenerated.h-generation.patch,
+ +files/2011.09/0003-ublimage-NAND-block-size-isn-t-set-at-build-time.patch,
+ +u-boot-tools-2011.09.ebuild:
+ Version bump.
14 Oct 2011; Mike Frysinger <vapier@gentoo.org> u-boot-tools-2011.06.ebuild:
Stabilize for all.
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
+AUX 2011.09/0001-Build-timestamp_autogenerated.h-without-config.patch 2988 RMD160 88742bf92ebd9286033f93338564c0a53bbee8d8 SHA1 8e6ffb9944b2c550efe04b43d336363c7bc5d2ad SHA256 c115ca451fd71b0e660321c11828cf703e26ff96563666aa6f0c5a49d7fdad33
+AUX 2011.09/0002-Safer-timestamp_autogenerated.h-generation.patch 1211 RMD160 4f216364912bf6b4ce497bdbd0ff461ad1c1ed3b SHA1 78f7160cd070faf31f189720c7d4b833cd25681b SHA256 63c1770b41b4fba383d1ac78530e54b7e44a7dbd351d83fdad9036aa588b4bd3
+AUX 2011.09/0003-ublimage-NAND-block-size-isn-t-set-at-build-time.patch 1933 RMD160 38f39a49afa683b3e7c656152bf278a5cd746589 SHA1 fdd31de13952c4eb35040f723235eb5de622f30a SHA256 a1f1dd216604b0b6cc1983bf269589fbf2117962713d0bc7b31f60d8c21729f6
DIST u-boot-2010.06.tar.bz2 8971985 RMD160 937931a38a8275c11469052ae2194192e34d1d21 SHA1 55bc16d8345a7c228dfa633f47184714e3fb733e SHA256 790ccb12d99fc527a8b8d20dfdf491795d30f87aa0902f8cbda196583aa20bc8
DIST u-boot-2010.12.tar.bz2 8238700 RMD160 81e43f941b72711cb326cf3e256dbf83235db55b SHA1 ba848b6762b79c25d61b8b4641944ec0ada56507 SHA256 1705772db7a18635693676abb8818542167cb131921c456a1edd0ed47e6b77fe
DIST u-boot-2011.06.tar.bz2 8469694 RMD160 7b97de43be54c225ee430f6a505d282421738737 SHA1 8362a83c72607f506a796f955f9e07cba5f92fff SHA256 362ddb935885da98cf461eba08f31e3e59d0c4ada6cb2fa15596f43af310ba8b
+DIST u-boot-2011.09.tar.bz2 8430168 RMD160 30a56bae6615b1e70c928e0f93a0676d1ee98a1d SHA1 9cd450c74f7c572df3b28701e641b03b42393d10 SHA256 6223d0141d2451dde6a9bfb8abbbdbc3696e1c3d289744d1918296561306ab4b
EBUILD u-boot-tools-2010.06.ebuild 1134 RMD160 082070f91655af5cb4c8b4662aacde05e46bfbcb SHA1 07a6af16d82ea9df04357712c07cdba02e576732 SHA256 d5c1d83fe78d924f2a53c58edf6826b5295e528b76182fa0d32f9222c1e23b0e
EBUILD u-boot-tools-2010.12.ebuild 907 RMD160 cf92452620d720e6d37a8e4d3e69b2db65833c44 SHA1 570f7080d7786d2f851a01c4008adaf939e621c3 SHA256 886f7d94304a3b7f40df335bb42d5586bf29e318e92b2e59454501c6e07985d2
-EBUILD u-boot-tools-2011.06.ebuild 969 RMD160 a754f6024df9ffc45c62197d8d9f7f7de6f0d00c SHA1 3aed1bcce3d89ea857a894deb883559d77330f49 SHA256 43cf8c3cb2619bf1cfcd2e56e91b9697563a2c2dc505a063e8e2954380f20461
-MISC ChangeLog 2817 RMD160 8168108f5a8276df7b2ad9cd138bc2f9eb61388a SHA1 bcf10dd90410917a5b9808f9124f13e947c03abe SHA256 09bec9da1082d7ccfa50bcd5dff83f792a0aaf0af284ca22403dd302d70f1557
+EBUILD u-boot-tools-2011.06.ebuild 963 RMD160 53babac0b87ad24bb1bd499e55e9510c014ee6e5 SHA1 6cfab4afec8a8eb5bd999a7a68b163cea42dc88b SHA256 79ad9b05f4b371b0647bfbb635eb00787af0fce26ce3d5ea1a98cf62ffe1bbef
+EBUILD u-boot-tools-2011.09.ebuild 1011 RMD160 1e47a11ba92d6b0dcba271deffc840bc441ec22e SHA1 44e27a6d78df59f196736dd08147f5fc33fe5787 SHA256 e970788d87629c412a175957e646ed67409e5a083185e7814643e03c66e243f8
+MISC ChangeLog 3277 RMD160 756eb2cb67b5b30a631054c4b788f1aab829c5ec SHA1 fdd396f43677f52a2b24ac5558ef9dbccdb2a31c SHA256 282b266009f1f947a339a807d69fb520b259c8a3c1120dd7255c4f210279dcb3
MISC metadata.xml 165 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 SHA1 54b9da7fdc6d8376c990288c72938be9855ef8b6 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBCgAGBQJOUKmDAAoJEEqz6FtPBkyjqfMH/iBuFW9JybrG8WVkpaaoFs4T
-QWesfDxtL7ufso2cGtGwbKpV2+yGIq2tDC+lZjUS/qZOqpgoCV2/1THSSMcvRA90
-vDgEnRRdUR42J9rLuZv9XU4qeOpWgUgsbzDV2+cwN4iFvqWwpPMAVjBOR9Gu1UEG
-m8PePhynhIU3l6f+Hg+1mMaXnajj0F4n4v+Q3P71v+8hfYfZR2AHMnvU3XnrKMVw
-Oi0h7d4ZmOYh/HK76IaHpopMK3QFUAFRFiCG0QDEhx5eXY5K9zS0r1NO2e0FESSz
-4X/oDgrDJYOcTk/HZSjmB+gk0ybPLcRpDRP+LjB5JyL9NQqkOc29j5TW5h5yq9s=
-=z/+f
+iF4EAREIAAYFAk6Yt9YACgkQaC/OocHi7JbkgwEAg8R3JD81g4UXmBbpUx+UKKB0
+DBMFUGOdWei944LaH/0A/Aj+Lrhu0i+NmUWUc0ipz//AVQ7PzTAX0XeaauEhAgGk
+=jEhE
-----END PGP SIGNATURE-----
--- /dev/null
+From 60b382058c223625aedeb0162f493edce9c7a991 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <loic.minier@linaro.org>
+Date: Mon, 3 Oct 2011 11:57:10 +0200
+Subject: [PATCH 1/3] Build timestamp_autogenerated.h without config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Tools such as mkimage include version information but are
+config-agnostic; build timestamp_autogenerated.h even when config.mk
+isn't generated to fix "make tools" build failure:
+gcc [...] -o mkimage.o mkimage.c -c
+In file included from include/version.h:27:0, from mkimage.c:26:
+include/timestamp.h:27:37: fatal error: timestamp_autogenerated.h: No
+such file or directory
+
+Cc: patches@linaro.org
+Signed-off-by: Loïc Minier <loic.minier@linaro.org>
+Acked-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile | 19 ++++++++++---------
+ 1 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b5fb288..a2d2cd7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -141,7 +141,7 @@ SUBDIRS = tools \
+ examples/standalone \
+ examples/api
+
+-.PHONY : $(SUBDIRS) $(VERSION_FILE)
++.PHONY : $(SUBDIRS) $(VERSION_FILE) $(TIMESTAMP_FILE)
+
+ ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk))
+
+@@ -294,7 +294,7 @@ LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
+ endif
+
+ LIBS := $(addprefix $(obj),$(sort $(LIBS)))
+-.PHONY : $(LIBS) $(TIMESTAMP_FILE)
++.PHONY : $(LIBS)
+
+ LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o
+ LIBBOARD := $(addprefix $(obj),$(LIBBOARD))
+@@ -459,10 +459,6 @@ $(obj)mmc_spl/u-boot-mmc-spl.bin: mmc_spl
+ $(obj)spl/u-boot-spl.bin: depend
+ $(MAKE) -C spl all
+
+-$(TIMESTAMP_FILE):
+- @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@
+- @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@
+-
+ updater:
+ $(MAKE) -C tools/updater all
+
+@@ -553,12 +549,12 @@ $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s: $(obj)include/autoconf.mk.dep
+ else # !config.mk
+ all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
+ $(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \
+-$(filter-out tools,$(SUBDIRS)) $(TIMESTAMP_FILE) \
++$(filter-out tools,$(SUBDIRS)) \
+ updater depend dep tags ctags etags cscope $(obj)System.map:
+ @echo "System not configured - see README" >&2
+ @ exit 1
+
+-tools: $(VERSION_FILE)
++tools: $(VERSION_FILE) $(TIMESTAMP_FILE)
+ $(MAKE) -C $@ all
+ endif # config.mk
+
+@@ -576,11 +572,16 @@ $(VERSION_FILE):
+ '$(shell $(LD) -v | head -n 1)' )>> $@.tmp
+ @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
+
++$(TIMESTAMP_FILE):
++ @mkdir -p $(dir $(TIMESTAMP_FILE))
++ @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@
++ @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@
++
+ easylogo env gdb:
+ $(MAKE) -C tools/$@ all MTD_VERSION=${MTD_VERSION}
+ gdbtools: gdb
+
+-tools-all: easylogo env gdb $(VERSION_FILE)
++tools-all: easylogo env gdb $(VERSION_FILE) $(TIMESTAMP_FILE)
+ $(MAKE) -C tools HOST_TOOLS_ALL=y
+
+ .PHONY : CHANGELOG
+--
+1.7.6.1
+
--- /dev/null
+From 205c4b02cd165b8641f08c3aee48d5ed6bd603bb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <loic.minier@linaro.org>
+Date: Mon, 3 Oct 2011 11:57:11 +0200
+Subject: [PATCH 2/3] Safer timestamp_autogenerated.h generation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Generate timestamp_autogenerated.h as safely as version_autogenerated.h.
+
+Cc: patches@linaro.org
+Signed-off-by: Loïc Minier <loic.minier@linaro.org>
+Acked-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a2d2cd7..845789d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -574,8 +574,9 @@ $(VERSION_FILE):
+
+ $(TIMESTAMP_FILE):
+ @mkdir -p $(dir $(TIMESTAMP_FILE))
+- @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@
+- @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@
++ @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@.tmp
++ @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@.tmp
++ @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
+
+ easylogo env gdb:
+ $(MAKE) -C tools/$@ all MTD_VERSION=${MTD_VERSION}
+--
+1.7.6.1
+
--- /dev/null
+From 4195b47f8aad7e83b54c62f793c3b249838afc84 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <loic.minier@linaro.org>
+Date: Mon, 3 Oct 2011 11:57:12 +0200
+Subject: [PATCH 3/3] ublimage: NAND block size isn't set at build-time
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+mkimage's ublimage support can't depend of build-time board configs;
+instead, this should be set in ublimage.cfg. Since currently no configs
+in u-boot override the NAND block size, hardcode it as such in
+ublimage.h to fix a build failure with "make tools":
+gcc [...] -o ublimage.o ublimage.c -c
+In file included from ublimage.c:37:0:
+ublimage.h:31:20: fatal error: config.h: No such file or directory
+
+Cc: Heiko Schocher <hs@denx.de>
+Cc: patches@linaro.org
+Signed-off-by: Loïc Minier <loic.minier@linaro.org>
+Acked-by: Heiko Schocher <hs@denx.de>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ tools/ublimage.h | 11 ++++-------
+ 1 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/tools/ublimage.h b/tools/ublimage.h
+index c926689..93ec8ee 100644
+--- a/tools/ublimage.h
++++ b/tools/ublimage.h
+@@ -28,12 +28,6 @@
+ #ifndef _UBLIMAGE_H_
+ #define _UBLIMAGE_H_
+
+-#include <config.h>
+-
+-#if !defined(CONFIG_SYS_UBL_BLOCK)
+-#define CONFIG_SYS_UBL_BLOCK 512
+-#endif
+-
+ enum ublimage_cmd {
+ CMD_INVALID,
+ CMD_BOOT_MODE,
+@@ -71,6 +65,9 @@ enum ublimage_fld_types {
+ /* Define max UBL image size */
+ #define UBL_IMAGE_SIZE (0x00003800u)
+
++/* one NAND block */
++#define UBL_BLOCK_SIZE 512
++
+ /* from sprufg5a.pdf Table 109 */
+ struct ubl_header {
+ uint32_t magic; /* Magic Number, see UBL_* defines */
+@@ -97,7 +94,7 @@ struct ubl_header {
+ * Magic Number indicates fast EMIF boot).
+ */
+ /* to fit in one nand block */
+- unsigned char res[CONFIG_SYS_UBL_BLOCK - 8 * 4];
++ unsigned char res[UBL_BLOCK_SIZE - 8 * 4];
+ };
+
+ #endif /* _UBLIMAGE_H_ */
+--
+1.7.6.1
+
--- /dev/null
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2011.09.ebuild,v 1.1 2011/10/14 22:29:35 vapier Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs eutils
+
+MY_P="u-boot-${PV/_/-}"
+DESCRIPTION="utilities for working with Das U-Boot"
+HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
+SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PV}/*.patch
+ sed -i -e "s:-g ::" tools/Makefile || die
+}
+
+src_compile() {
+ emake \
+ HOSTSTRIP=echo \
+ HOSTCC="$(tc-getCC)" \
+ HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
+ HOSTLDFLAGS="${LDFLAGS}" \
+ tools-all
+}
+
+src_install() {
+ cd tools
+ dobin bmp_logo gen_eth_addr img2srec mkimage
+ dobin easylogo/easylogo
+ dobin env/fw_printenv
+ dosym fw_printenv /usr/bin/fw_setenv
+ insinto /etc
+ doins env/fw_env.config
+}
projects / gentoo.git / commitdiff