V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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>
This commit is contained in:
Loïc Minier 2011-10-03 11:57:10 +02:00 committed by Wolfgang Denk
parent 2099f9005e
commit 249b53a612
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -141,7 +141,7 @@ SUBDIRS = tools \
examples/standalone \ examples/standalone \
examples/api examples/api
.PHONY : $(SUBDIRS) $(VERSION_FILE) .PHONY : $(SUBDIRS) $(VERSION_FILE) $(TIMESTAMP_FILE)
ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk)) ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk))
@ -296,7 +296,7 @@ LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
endif endif
LIBS := $(addprefix $(obj),$(sort $(LIBS))) LIBS := $(addprefix $(obj),$(sort $(LIBS)))
.PHONY : $(LIBS) $(TIMESTAMP_FILE) .PHONY : $(LIBS)
LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o
LIBBOARD := $(addprefix $(obj),$(LIBBOARD)) 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 $(obj)spl/u-boot-spl.bin: depend
$(MAKE) -C spl all $(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: updater:
$(MAKE) -C tools/updater all $(MAKE) -C tools/updater all
@ -549,12 +545,12 @@ $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s: $(obj)include/autoconf.mk.dep
else # !config.mk else # !config.mk
all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \ all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
$(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \ $(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: updater depend dep tags ctags etags cscope $(obj)System.map:
@echo "System not configured - see README" >&2 @echo "System not configured - see README" >&2
@ exit 1 @ exit 1
tools: $(VERSION_FILE) tools: $(VERSION_FILE) $(TIMESTAMP_FILE)
$(MAKE) -C $@ all $(MAKE) -C $@ all
endif # config.mk endif # config.mk
@ -572,11 +568,16 @@ $(VERSION_FILE):
'$(shell $(LD) -v | head -n 1)' )>> $@.tmp '$(shell $(LD) -v | head -n 1)' )>> $@.tmp
@cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.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: easylogo env gdb:
$(MAKE) -C tools/$@ all MTD_VERSION=${MTD_VERSION} $(MAKE) -C tools/$@ all MTD_VERSION=${MTD_VERSION}
gdbtools: gdb 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 $(MAKE) -C tools HOST_TOOLS_ALL=y
.PHONY : CHANGELOG .PHONY : CHANGELOG