Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 76533135f27f61bc09ff114d28e9825e3d8a879e..80eb239d93929be40b638d4bd4c81c68deb18f0e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@
 VERSION = 2014
 PATCHLEVEL = 07
 SUBLEVEL =
-EXTRAVERSION = -rc4
+EXTRAVERSION =
 NAME =
 
 # *DOCUMENTATION*
@@ -788,7 +788,8 @@ OBJCOPYFLAGS_u-boot.bin := -O binary
 binary_size_check: u-boot.bin System.map FORCE
        @file_size=`stat -c %s u-boot.bin` ; \
        map_size=$(shell cat System.map | \
-               awk '/_image_copy_start/ {start = $$1} /_image_binary_end/ {end = $$1} END {if (start != "" && end != "") print strtonum("0x" end) - strtonum("0x" start)}'); \
+               awk '/_image_copy_start/ {start = $$1} /_image_binary_end/ {end = $$1} END {if (start != "" && end != "") print "ibase=16; " toupper(end) " - " toupper(start)}' \
+               | bc); \
        if [ "" != "$$map_size" ]; then \
                if test $$map_size -ne $$file_size; then \
                        echo "System.map shows a binary size of $$map_size" >&2 ; \
@@ -1142,7 +1143,7 @@ spl/sunxi-spl.bin: spl/u-boot-spl
 tpl/u-boot-tpl.bin: tools prepare
        $(Q)$(MAKE) obj=tpl -f $(srctree)/scripts/Makefile.spl all CONFIG_TPL_BUILD=y
 
-TAG_SUBDIRS := $(u-boot-dirs) include
+TAG_SUBDIRS := $(patsubst %,$(srctree)/%,$(u-boot-dirs) include)
 
 FIND := find
 FINDFLAGS := -L
@@ -1152,7 +1153,7 @@ tags ctags:
                                                -name '*.[chS]' -print`
 
 etags:
-               etags -a -o $(obj)etags `$(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) \
+               etags -a -o etags `$(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) \
                                                -name '*.[chS]' -print`
 cscope:
                $(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) -name '*.[chS]' -print > \
@@ -1227,7 +1228,7 @@ CLOBBER_FILES += u-boot* MLO* SPL System.map
 MRPROPER_DIRS  += include/config include/generated          \
                  .tmp_objdiff
 MRPROPER_FILES += .config .config.old \
-                 tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
+                 ctags etags cscope* GPATH GTAGS GRTAGS GSYMS \
                  include/config.h include/config.mk
 
 # clean - Delete most, but leave enough to build external modules
@@ -1279,7 +1280,7 @@ $(mrproper-dirs):
 mrproper: clobber $(mrproper-dirs)
        $(call cmd,rmdirs)
        $(call cmd,rmfiles)
-       @rm -f arch/*/include/asm/arch arch/*/include/asm/proc
+       @rm -f arch/*/include/asm/arch
 
 # distclean
 #
@@ -1316,7 +1317,8 @@ help:
        @echo  '  dir/file.[oisS] - Build specified target only'
        @echo  '  dir/file.lst    - Build specified mixed source/assembly target only'
        @echo  '                    (requires a recent binutils and recent build (System.map))'
-       @echo  '  tags/TAGS       - Generate tags file for editors'
+       @echo  '  tags/ctags      - Generate ctags file for editors'
+       @echo  '  etags           - Generate etags file for editors'
        @echo  '  cscope          - Generate cscope index'
        @echo  '  ubootrelease    - Output the release version string'
        @echo  '  ubootversion    - Output the version stored in Makefile'