Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx

[oweals/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index b4d21fabe0f2db985944b68c62b6fe379cfcf4eb..4f4efa4844dc91403fc5b212b9835ad64babd8cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 VERSION = 1
 PATCHLEVEL = 3
 SUBLEVEL = 2
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 VERSION_FILE = $(obj)include/version_autogenerated.h
 
@@ -244,7 +244,7 @@ LIBS += libfdt/libfdt.a
 LIBS += api/libapi.a
 
 LIBS := $(addprefix $(obj),$(LIBS))
-.PHONY : $(LIBS)
+.PHONY : $(LIBS) $(VERSION_FILE)
 
 # Add GCC lib
 PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
@@ -326,6 +326,9 @@ $(LIBS):    depend $(obj)include/autoconf.mk
 $(SUBDIRS):    depend $(obj)include/autoconf.mk
                $(MAKE) -C $@ all
 
+$(LDSCRIPT):   depend $(obj)include/autoconf.mk
+               $(MAKE) -C $(dir $@) $(notdir $@)
+
 $(NAND_SPL):   $(VERSION_FILE) $(obj)include/autoconf.mk
                $(MAKE) -C nand_spl/board/$(BOARDDIR) all
 
@@ -411,6 +414,7 @@ $(obj)System.map:   $(obj)u-boot
 # to regenerate the autoconf.mk file.
 $(obj)include/autoconf.mk: $(obj)include/config.h $(VERSION_FILE)
        @$(XECHO) Generating include/autoconf.mk ; \
+       set -e ; \
        : Generate the dependancies ; \
        $(CC) -M $(HOST_CFLAGS) $(CPPFLAGS) -MQ $@ include/common.h > $@.dep ; \
        : Extract the config macros ; \
@@ -729,8 +733,15 @@ motionpro_config:  unconfig
 #########################################################################
 ## MPC512x Systems
 #########################################################################
-ads5121_config: unconfig
-       @$(MKCONFIG) ads5121 ppc mpc512x ads5121
+ads5121_config \
+ads5121_PCI_config \
+       :                unconfig
+       @echo "" >$(obj)include/config.h
+       @if [ "$(findstring _PCI_,$@)" ] ; then \
+               echo "#define CONFIG_PCI"  >>$(obj)include/config.h ; \
+               $(XECHO) "... with PCI enabled" ; \
+       fi
+       @$(MKCONFIG) -a ads5121 ppc mpc512x ads5121
 
 
 #########################################################################