Merge branch 'master' of ../master

[platform/kernel/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index 3e11f6f..bba41cb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 VERSION = 2010
 PATCHLEVEL = 06
 SUBLEVEL =
-EXTRAVERSION = -rc2
+EXTRAVERSION =
 ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 else
@@ -40,7 +40,8 @@ HOSTARCH := $(shell uname -m | \
            -e s/sa110/arm/ \
            -e s/ppc64/powerpc/ \
            -e s/ppc/powerpc/ \
-           -e s/macppc/powerpc/)
+           -e s/macppc/powerpc/\
+           -e s/sh.*/sh/)
 
 HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \
            sed -e 's/\(cygwin\).*/cygwin/')
@@ -244,6 +245,13 @@ LIBS += lib/libfdt/libfdt.a
 LIBS += api/libapi.a
 LIBS += post/libpost.a
 
+ifeq ($(SOC),omap3)
+LIBS += $(CPUDIR)/omap-common/libomap-common.a
+endif
+ifeq ($(SOC),omap4)
+LIBS += $(CPUDIR)/omap-common/libomap-common.a
+endif
+
 LIBS := $(addprefix $(obj),$(LIBS))
 .PHONY : $(LIBS) $(TIMESTAMP_FILE) $(VERSION_FILE)
 
@@ -385,8 +393,8 @@ $(VERSION_FILE):
                @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
 
 $(TIMESTAMP_FILE):
-               @date +'#define U_BOOT_DATE "%b %d %C%y"' > $@
-               @date +'#define U_BOOT_TIME "%T"' >> $@
+               @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@
+               @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@
 
 gdbtools:
                $(MAKE) -C tools/gdb all || exit 1
@@ -2435,7 +2443,6 @@ clean:
               $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}      \
               $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
               $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds  \
-              $(obj)arch/blackfin/lib/u-boot.lds                                 \
               $(obj)u-boot.lds                                           \
               $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs]
        @rm -f $(obj)include/bmp_logo.h
@@ -2476,6 +2483,6 @@ endif
 
 backup:
        F=`basename $(TOPDIR)` ; cd .. ; \
-       gtar --force-local -zcvf `date "+$$F-%Y-%m-%d-%T.tar.gz"` $$F
+       gtar --force-local -zcvf `LC_ALL=C date "+$$F-%Y-%m-%d-%T.tar.gz"` $$F
 
 #########################################################################