work/u-boot-2011.09.tools1.patch

   1 From: Loïc Minier <loic.minier@linaro.org>
   2 Date: Mon, 3 Oct 2011 09:57:10 +0000 (+0200)
   3 Subject: Build timestamp_autogenerated.h without config
   4 X-Git-Url: http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commitdiff_plain;h=249b53a6129bc24d26e52718a8a7b42751f11033
   5
   6 Build timestamp_autogenerated.h without config
   7
   8 Tools such as mkimage include version information but are
   9 config-agnostic; build timestamp_autogenerated.h even when config.mk
  10 isn't generated to fix "make tools" build failure:
  11 gcc [...] -o mkimage.o mkimage.c -c
  12 In file included from include/version.h:27:0, from mkimage.c:26:
  13 include/timestamp.h:27:37: fatal error: timestamp_autogenerated.h: No
  14 such file or directory
  15
  16 Cc: patches@linaro.org
  17 Signed-off-by: Loïc Minier <loic.minier@linaro.org>
  18 Acked-by: Mike Frysinger <vapier@gentoo.org>
  19 ---
  20
  21 diff --git a/Makefile b/Makefile
  22 index cd6fc8c..1a9a4db 100644
  23 --- a/Makefile
  24 +++ b/Makefile
  25 @@ -141,7 +141,7 @@ SUBDIRS     = tools \
  26           examples/standalone \
  27           examples/api
  28
  29 -.PHONY : $(SUBDIRS) $(VERSION_FILE)
  30 +.PHONY : $(SUBDIRS) $(VERSION_FILE) $(TIMESTAMP_FILE)
  31
  32  ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk))
  33
  34 @@ -296,7 +296,7 @@ LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
  35  endif
  36
  37  LIBS := $(addprefix $(obj),$(sort $(LIBS)))
  38 -.PHONY : $(LIBS) $(TIMESTAMP_FILE)
  39 +.PHONY : $(LIBS)
  40
  41  LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o
  42  LIBBOARD := $(addprefix $(obj),$(LIBBOARD))
  43 @@ -455,10 +455,6 @@ $(obj)mmc_spl/u-boot-mmc-spl.bin:  mmc_spl
  44  $(obj)spl/u-boot-spl.bin:              depend
  45                 $(MAKE) -C spl all
  46
  47 -$(TIMESTAMP_FILE):
  48 -               @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@
  49 -               @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@
  50 -
  51  updater:
  52                 $(MAKE) -C tools/updater all
  53
  54 @@ -549,12 +545,12 @@ $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s:     $(obj)include/autoconf.mk.dep
  55  else   # !config.mk
  56  all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
  57  $(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \
  58 -$(filter-out tools,$(SUBDIRS)) $(TIMESTAMP_FILE) \
  59 +$(filter-out tools,$(SUBDIRS)) \
  60  updater depend dep tags ctags etags cscope $(obj)System.map:
  61         @echo "System not configured - see README" >&2
  62         @ exit 1
  63
  64 -tools: $(VERSION_FILE)
  65 +tools: $(VERSION_FILE) $(TIMESTAMP_FILE)
  66         $(MAKE) -C $@ all
  67  endif  # config.mk
  68
  69 @@ -572,11 +568,16 @@ $(VERSION_FILE):
  70                  '$(shell $(LD) -v | head -n 1)' )>>  $@.tmp
  71                 @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
  72
  73 +$(TIMESTAMP_FILE):
  74 +               @mkdir -p $(dir $(TIMESTAMP_FILE))
  75 +               @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@
  76 +               @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@
  77 +
  78  easylogo env gdb:
  79         $(MAKE) -C tools/$@ all MTD_VERSION=${MTD_VERSION}
  80  gdbtools: gdb
  81
  82 -tools-all: easylogo env gdb $(VERSION_FILE)
  83 +tools-all: easylogo env gdb $(VERSION_FILE) $(TIMESTAMP_FILE)
  84         $(MAKE) -C tools HOST_TOOLS_ALL=y
  85
  86  .PHONY : CHANGELOG