PWD = $(shell pwd)
WORK = $(PWD)/work
-UBOOT_VERSION = 2011.09
+UBOOT_VERSION = 2011.12
.PHONY: all help mkimage clean dist-clean efikamx efikamx-clean efikamx-distclean
$(WORK)/u-boot-$(UBOOT_VERSION): $(WORK)/u-boot-$(UBOOT_VERSION).tar.bz2
tar -C $(WORK) -xjf $(WORK)/u-boot-$(UBOOT_VERSION).tar.bz2
- cd $(WORK)/u-boot-$(UBOOT_VERSION) && \
- patch -p1 -i $(WORK)/u-boot-$(UBOOT_VERSION).tools1.patch && \
- patch -p1 -i $(WORK)/u-boot-$(UBOOT_VERSION).tools2.patch && \
- patch -p1 -i $(WORK)/u-boot-$(UBOOT_VERSION).tools3.patch
touch $(WORK)/u-boot-$(UBOOT_VERSION)
$(WORK)/mkimage: $(WORK)/u-boot-$(UBOOT_VERSION)
$(WORK)/uInitrd: $(MKIMAGE) $(INITRDGZ)
$(MKIMAGE) -A arm -O linux -a 0 -e 0 \
- -T ramdisk -C none -n "EfikaMX Initrd Image" \
+ -T ramdisk -C none -n "CRUX-ARM Initrd Image" \
-d $(INITRDGZ) $(WORK)/uInitrd
uInitrd: $(WORK)/uInitrd
+++ /dev/null
-From: Loïc Minier <loic.minier@linaro.org>
-Date: Mon, 3 Oct 2011 09:57:10 +0000 (+0200)
-Subject: Build timestamp_autogenerated.h without config
-X-Git-Url: http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commitdiff_plain;h=249b53a6129bc24d26e52718a8a7b42751f11033
-
-Build timestamp_autogenerated.h without config
-
-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>
----
-
-diff --git a/Makefile b/Makefile
-index cd6fc8c..1a9a4db 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))
-
-@@ -296,7 +296,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))
-@@ -455,10 +455,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
-
-@@ -549,12 +545,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
-
-@@ -572,11 +568,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
+++ /dev/null
-From: Loïc Minier <loic.minier@linaro.org>
-Date: Mon, 3 Oct 2011 09:57:11 +0000 (+0200)
-Subject: Safer timestamp_autogenerated.h generation
-X-Git-Url: http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commitdiff_plain;h=a76406fb05f68bcf0156f456f8ba17ef076cebab
-
-Safer timestamp_autogenerated.h generation
-
-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>
----
-
-diff --git a/Makefile b/Makefile
-index 1a9a4db..5db2e0e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -570,8 +570,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}
+++ /dev/null
-From: Loïc Minier <loic.minier@linaro.org>
-Date: Mon, 3 Oct 2011 09:57:12 +0000 (+0200)
-Subject: ublimage: NAND block size isn't set at build-time
-X-Git-Url: http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commitdiff_plain;h=9f8765805400db65b44c3edb68a638f17dd8399d
-
-ublimage: NAND block size isn't set at build-time
-
-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>
----
-
-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_ */
development / bootloader.git / commitdiff