* Patch by Pierre Aubert, 24 Nov 2003:

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

diff --git a/Makefile b/Makefile
index 08ac056..5defc87 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -80,19 +80,20 @@ export      CROSS_COMPILE
 #########################################################################
 # U-Boot objects....order is important (i.e. start must be first)
 
-OBJS  =        cpu/$(CPU)/start.o
+OBJS  = cpu/$(CPU)/start.o
 ifeq ($(CPU),i386)
-OBJS +=        cpu/$(CPU)/start16.o
-OBJS +=        cpu/$(CPU)/reset.o
+OBJS += cpu/$(CPU)/start16.o
+OBJS += cpu/$(CPU)/reset.o
 endif
 ifeq ($(CPU),ppc4xx)
-OBJS +=        cpu/$(CPU)/resetvec.o
+OBJS += cpu/$(CPU)/resetvec.o
 endif
 ifeq ($(CPU),mpc85xx)
 OBJS += cpu/$(CPU)/resetvec.o
 endif
 
-LIBS  =        board/$(BOARDDIR)/lib$(BOARD).a
+LIBS  = lib_generic/libgeneric.a
+LIBS += board/$(BOARDDIR)/lib$(BOARD).a
 LIBS += cpu/$(CPU)/lib$(CPU).a
 LIBS += lib_$(ARCH)/lib$(ARCH).a
 LIBS += fs/jffs2/libjffs2.a fs/fdos/libfdos.a fs/fat/libfat.a
@@ -104,7 +105,7 @@ LIBS += drivers/libdrivers.a
 LIBS += drivers/sk98lin/libsk98lin.a
 LIBS += post/libpost.a post/cpu/libcpu.a
 LIBS += common/libcommon.a
-LIBS += lib_generic/libgeneric.a
+.PHONY : $(LIBS)
 
 # Add GCC lib
 PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
@@ -115,6 +116,7 @@ SUBDIRS     = tools \
          examples \
          post \
          post/cpu
+.PHONY : $(SUBDIRS)
 
 #########################################################################
 #########################################################################
@@ -149,8 +151,7 @@ $(LIBS):
                $(MAKE) -C `dirname $@`
 
 $(SUBDIRS):
-               @echo "#### MAKE $@ ####"
-               $(MAKE) -C $@
+               $(MAKE) -C $@ all
 
 gdbtools:
                $(MAKE) -C tools/gdb || exit 1
@@ -375,6 +376,15 @@ NX823_config:              unconfig
 pcu_e_config:          unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx pcu_e siemens
 
+QS850_config:  unconfig
+       @./mkconfig $(@:_config=) ppc mpc8xx qs850 snmc
+
+QS823_config:  unconfig
+       @./mkconfig $(@:_config=) ppc mpc8xx qs850 snmc
+
+QS860T_config: unconfig
+       @./mkconfig $(@:_config=) ppc mpc8xx qs860t snmc
+
 R360MPI_config:        unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx r360mpi
 
@@ -638,6 +648,9 @@ MOUSSE_config: unconfig
 MUSENKI_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc824x musenki
 
+MVBLUE_config: unconfig
+       @./mkconfig $(@:_config=) ppc mpc824x mvblue
+
 OXC_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc824x oxc