MIPS: Move Alchemy Au1x00 based boards to boards.cfg

[people/ms/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index fd21ef3cff3b35ffdd4c183a8c400136738a1376..e1f3b7fd16c3a2019089b1c8894975c5f40f0569 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,10 @@
 # MA 02111-1307 USA
 #
 
-VERSION = 2010
-PATCHLEVEL = 12
+VERSION = 2011
+PATCHLEVEL = 03
 SUBLEVEL =
-EXTRAVERSION =
+EXTRAVERSION = -rc1
 ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 else
@@ -369,7 +369,7 @@ $(obj)u-boot.dis:   $(obj)u-boot
 GEN_UBOOT = \
                UNDEF_SYM=`$(OBJDUMP) -x $(LIBBOARD) $(LIBS) | \
                sed  -n -e 's/.*\($(SYM_PREFIX)__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
-               cd $(LNDIR) && $(LD) $(LDFLAGS) $$UNDEF_SYM $(__OBJS) \
+               cd $(LNDIR) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) $$UNDEF_SYM $(__OBJS) \
                        --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \
                        -Map u-boot.map -o u-boot
 $(obj)u-boot:  depend \
@@ -416,6 +416,10 @@ $(U_BOOT_ONENAND): $(ONENAND_IPL) $(obj)u-boot.bin
 $(VERSION_FILE):
                @( printf '#define U_BOOT_VERSION "U-Boot %s%s"\n' "$(U_BOOT_VERSION)" \
                 '$(shell $(TOPDIR)/tools/setlocalversion $(TOPDIR))' ) > $@.tmp
+               @( printf '#define CC_VERSION_STRING "%s"\n' \
+                '$(shell $(CC) --version | head -n 1)' )>>  $@.tmp
+               @( printf '#define LD_VERSION_STRING "%s"\n' \
+                '$(shell $(LD) -v | head -n 1)' )>>  $@.tmp
                @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
 
 $(TIMESTAMP_FILE):
@@ -1132,45 +1136,6 @@ vct_platinumavc_onenand_small_config: unconfig
                echo "#define CONFIG_VCT_SMALL_IMAGE" >> $(obj)include/config.h
        @$(MKCONFIG)  -n $@ -a vct mips mips vct micronas
 
-#########################################################################
-## MIPS32 AU1X00
-#########################################################################
-
-dbau1000_config                :       unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_DBAU1000 1" >$(obj)include/config.h
-       @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
-
-dbau1100_config                :       unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_DBAU1100 1" >$(obj)include/config.h
-       @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
-
-dbau1500_config                :       unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_DBAU1500 1" >$(obj)include/config.h
-       @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
-
-dbau1550_config                :       unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_DBAU1550 1" >$(obj)include/config.h
-       @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
-
-dbau1550_el_config     :       unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_DBAU1550 1" >$(obj)include/config.h
-       @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
-
-gth2_config            :       unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_GTH2 1" >$(obj)include/config.h
-       @$(MKCONFIG) -a $@ mips mips gth2
-
-pb1000_config          :       unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_PB1000 1" >$(obj)include/config.h
-       @$(MKCONFIG) -a pb1x00 mips mips pb1x00
-
 qemu_mips_config       : unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_QEMU_MIPS 1" >$(obj)include/config.h