[Blackfin][PATCH] Fix BUILD_DIR option of MAKEALL building issue

diff --git a/board/bf533-ezkit/Makefile b/board/bf533-ezkit/Makefile
index 8f51eb2f955244735d5c4053be97c280e8234e28..4fe7d785f36ca24ff1ae2cbda597d522f05060c4 100644 (file)
--- a/board/bf533-ezkit/Makefile
+++ b/board/bf533-ezkit/Makefile
@@ -27,22 +27,32 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = lib$(BOARD).a
+LIB    = $(obj)lib$(BOARD).a
 
-OBJS   = $(BOARD).o flash.o
+COBJS  := $(BOARD).o flash.o
 
-$(LIB):        .depend $(OBJS) u-boot.lds
-       $(AR) cr $@ $(OBJS)
+SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS))
+SOBJS  := $(addprefix $(obj),$(SOBJS))
+
+$(LIB):        $(obj).depend $(OBJS) $(SOBJS) u-boot.lds
+       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
 
 u-boot.lds: u-boot.lds.S
        $(CPP) $(CPPFLAGS) -P -Ubfin $^ > $@.tmp
        mv -f $@.tmp $@
 
+clean:
+       rm -f $(SOBJS) $(OBJS)
+
+distclean:     clean
+       rm -f $(LIB) core *.bak .depend
+
 #########################################################################
 
-.depend:       Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
-               $(CC) -M $(CFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
 
-sinclude .depend
+sinclude $(obj).depend
 
 #########################################################################

diff --git a/board/bf533-stamp/Makefile b/board/bf533-stamp/Makefile
index 217e5f00fdcd113cbf3f44ba40ba2ecd7642aaa9..8223d591ce41b493b22ecd302f24bb8eb8b62f51 100644 (file)
--- a/board/bf533-stamp/Makefile
+++ b/board/bf533-stamp/Makefile
@@ -27,22 +27,32 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = lib$(BOARD).a
+LIB    = $(obj)lib$(BOARD).a
 
-OBJS   = $(BOARD).o spi.o
+COBJS  := $(BOARD).o spi.o
 
-$(LIB):        .depend $(OBJS) u-boot.lds
-       $(AR) cr $@ $(OBJS)
+SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS))
+SOBJS  := $(addprefix $(obj),$(SOBJS))
+
+$(LIB):        $(obj).depend $(OBJS) $(SOBJS) u-boot.lds
+       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
 
 u-boot.lds: u-boot.lds.S
        $(CPP) $(CPPFLAGS) -P -Ubfin $^ > $@.tmp
        mv -f $@.tmp $@
 
+clean:
+       rm -f $(SOBJS) $(OBJS)
+
+distclean:     clean
+       rm -f $(LIB) core *.bak .depend
+
 #########################################################################
 
-.depend:       Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
-               $(CC) -M $(CFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
 
-sinclude .depend
+sinclude $(obj).depend
 
 #########################################################################

diff --git a/cpu/bf533/Makefile b/cpu/bf533/Makefile
index 6fd5e337c1b75b05d926157c44c33914918d9649..ee7842a5d3de4b1b6ae2840d2b714eb08b3b657d 100644 (file)
--- a/cpu/bf533/Makefile
+++ b/cpu/bf533/Makefile
@@ -26,23 +26,27 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = lib$(CPU).a
+LIB    = $(obj)lib$(CPU).a
 
 START  = start.o start1.o interrupt.o cache.o flush.o init_sdram.o
-OBJS   = cpu.o traps.o ints.o serial.o interrupts.o video.o
+COBJS  = cpu.o traps.o ints.o serial.o interrupts.o video.o
 
 EXTRA = init_sdram_bootrom_initblock.o
 
-all:   .depend $(START) $(LIB) .depend $(EXTRA)
+SRCS   := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS) $(SOBJS))
+START  := $(addprefix $(obj),$(START))
+
+all:   $(obj).depend $(START) $(LIB) $(obj).depend $(EXTRA)
 
 $(LIB):        $(OBJS)
-       $(AR) cr $@ $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
 
 #########################################################################
 
-.depend:       Makefile $(START:.o=.S) $(OBJS:.o=.c)
-               $(CC) -M $(CFLAGS) $(START:.o=.S) $(OBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
 
-sinclude .depend
+sinclude $(obj).depend
 
 #########################################################################

diff --git a/lib_blackfin/Makefile b/lib_blackfin/Makefile
index 41714736574aa190ca431600fbcd7e85306f8d80..ac786626f7114e0bc11a6cfda463a885ad15f0ea 100644 (file)
--- a/lib_blackfin/Makefile
+++ b/lib_blackfin/Makefile
@@ -27,21 +27,23 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = lib$(ARCH).a
+LIB    = $(obj)lib$(ARCH).a
 
-AOBJS  = memcpy.o memcmp.o memset.o memmove.o
+SOBJS  = memcpy.o memcmp.o memset.o memmove.o
 
 COBJS  = post.o tests.o board.o bf533_linux.o bf533_string.o cache.o muldi3.o
-OBJS   = $(AOBJS) $(COBJS)
 
-$(LIB):        .depend $(OBJS)
-       $(AR) cr $@ $(OBJS)
+SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
+
+$(LIB):        $(obj).depend $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
 
 #########################################################################
 
-.depend:       Makefile $(AOBJS:.o=.S) $(COBJS:.o=.c)
-               $(CC) -M $(CFLAGS) $(AOBJS:.o=.S) $(COBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
 
-sinclude .depend
+sinclude $(obj).depend
 
 #########################################################################