summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2010-08-08 15:55:50 +0200
committerWolfgang Denk <wd@denx.de>2010-08-09 01:13:59 +0200
commit68e8a289dce8c409340ac07f20b1d2d5dc4d7485 (patch)
treeb8de42a527418e20a6f44c33a5b6ebdc460eaa29 /board
parentf534c7cdc66158fbf4d5e8b953e84ba070729d72 (diff)
downloadu-boot-imx-68e8a289dce8c409340ac07f20b1d2d5dc4d7485.zip
u-boot-imx-68e8a289dce8c409340ac07f20b1d2d5dc4d7485.tar.gz
u-boot-imx-68e8a289dce8c409340ac07f20b1d2d5dc4d7485.tar.bz2
PXA: Fix off-the-tree build problems
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Diffstat (limited to 'board')
-rw-r--r--board/colibri_pxa270/Makefile20
-rw-r--r--board/vpac270/Makefile20
2 files changed, 24 insertions, 16 deletions
diff --git a/board/colibri_pxa270/Makefile b/board/colibri_pxa270/Makefile
index 44d73cc..ae570e1 100644
--- a/board/colibri_pxa270/Makefile
+++ b/board/colibri_pxa270/Makefile
@@ -21,25 +21,29 @@
include $(TOPDIR)/config.mk
-LIB = lib$(BOARD).a
+LIB = $(obj)lib$(BOARD).a
-OBJS := colibri_pxa270.o
+COBJS := colibri_pxa270.o
SOBJS := lowlevel_init.o
-$(LIB): $(OBJS) $(SOBJS)
- $(AR) crv $@ $(OBJS) $(SOBJS)
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
+
+$(LIB): $(obj).depend $(OBJS) $(SOBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
clean:
rm -f $(SOBJS) $(OBJS)
distclean: clean
- rm -f $(LIB) core *.bak .depend
+ rm -f $(LIB) core *.bak $(obj).depend
#########################################################################
-.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
- $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
--include .depend
+sinclude $(obj).depend
#########################################################################
diff --git a/board/vpac270/Makefile b/board/vpac270/Makefile
index 0f3eacd..c6f4c7c 100644
--- a/board/vpac270/Makefile
+++ b/board/vpac270/Makefile
@@ -24,25 +24,29 @@
include $(TOPDIR)/config.mk
-LIB = lib$(BOARD).a
+LIB = $(obj)lib$(BOARD).a
-OBJS := vpac270.o
+COBJS := vpac270.o
SOBJS := lowlevel_init.o
-$(LIB): $(OBJS) $(SOBJS)
- $(AR) crv $@ $(OBJS) $(SOBJS)
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
+
+$(LIB): $(obj).depend $(OBJS) $(SOBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
clean:
rm -f $(SOBJS) $(OBJS)
distclean: clean
- rm -f $(LIB) core *.bak .depend
+ rm -f $(LIB) core *.bak $(obj).depend
#########################################################################
-.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
- $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
--include .depend
+sinclude $(obj).depend
#########################################################################