Merge branch 'master' of ../master

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

diff --git a/Makefile b/Makefile
index 9f7883a..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
@@ -1999,6 +2007,10 @@ at91sam9g45ekes_config   :       unconfig
        fi;
        @$(MKCONFIG) -n $@ -a at91sam9m10g45ek arm arm926ejs at91sam9m10g45ek atmel at91
 
+pm9g45_config  :       unconfig
+       @mkdir -p $(obj)include
+       @$(MKCONFIG) -a pm9g45 arm arm926ejs pm9g45 ronetix at91
+
 SBC35_A9G20_NANDFLASH_config \
 SBC35_A9G20_EEPROM_config \
 SBC35_A9G20_config     :       unconfig
@@ -2042,18 +2054,6 @@ cp922_XA10_config        \
 cp1026_config: unconfig
        @board/armltd/integrator/split_by_variant.sh cp $@
 
-da830evm_config                        \
-davinci_dvevm_config           \
-davinci_schmoogie_config       \
-davinci_sffsdr_config          \
-davinci_sonata_config          \
-davinci_dm355evm_config                \
-davinci_dm355leopard_config    \
-davinci_dm365evm_config                \
-davinci_dm6467evm_config       :       unconfig
-       @$(MKCONFIG) -n $@ $@ arm arm926ejs \
-               $(subst davinci_,,$(@:_config=)) davinci davinci
-
 nhk8815_config \
 nhk8815_onenand_config:        unconfig
        @mkdir -p $(obj)include
@@ -2221,7 +2221,8 @@ smdk6400_config   :       unconfig
        else                                                                            \
                echo "RAM_TEXT = 0xc7e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\
        fi
-       @$(MKCONFIG) $(subst _noUSB,,$(@:_config=)) arm arm1176 smdk6400 samsung s3c64xx
+       @$(MKCONFIG) smdk6400 arm arm1176 smdk6400 samsung s3c64xx
+       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 
 #========================================================================
 # MIPS
@@ -2442,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
@@ -2483,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
 
 #########################################################################