summaryrefslogtreecommitdiff
path: root/board/amcc/acadia
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-03-31 13:44:12 +0200
committerStefan Roese <sr@denx.de>2007-03-31 13:44:12 +0200
commit0e7d4916afaf83083b9b70ad779f29f7b57bd8ed (patch)
tree40e9396ee819149a89f520f551d1ed31cb8f5216 /board/amcc/acadia
parentda6ebc1bc082cbe3b6bbde079cafe09f7ebbad4b (diff)
parent6db7d0af2336c126e4d4b2f248cc23516bdd46a8 (diff)
downloadu-boot-imx-0e7d4916afaf83083b9b70ad779f29f7b57bd8ed.zip
u-boot-imx-0e7d4916afaf83083b9b70ad779f29f7b57bd8ed.tar.gz
u-boot-imx-0e7d4916afaf83083b9b70ad779f29f7b57bd8ed.tar.bz2
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/amcc/acadia')
-rw-r--r--board/amcc/acadia/Makefile20
-rw-r--r--board/amcc/acadia/config.mk2
2 files changed, 12 insertions, 10 deletions
diff --git a/board/amcc/acadia/Makefile b/board/amcc/acadia/Makefile
index 183f694..abcbf3e 100644
--- a/board/amcc/acadia/Makefile
+++ b/board/amcc/acadia/Makefile
@@ -23,25 +23,29 @@
include $(TOPDIR)/config.mk
-LIB = lib$(BOARD).a
+LIB = $(obj)lib$(BOARD).a
-OBJS = $(BOARD).o cpr.o memory.o
+COBJS = $(BOARD).o cpr.o memory.o
SOBJS =
-$(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)
clean:
rm -f $(SOBJS) $(OBJS)
distclean: clean
- rm -f $(LIB) core *.bak .depend
+ 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/amcc/acadia/config.mk b/board/amcc/acadia/config.mk
index 1524bad..c8566ec 100644
--- a/board/amcc/acadia/config.mk
+++ b/board/amcc/acadia/config.mk
@@ -21,8 +21,6 @@
# MA 02111-1307 USA
#
-sinclude $(TOPDIR)/board/amcc/liveoak/config.tmp
-
ifndef TEXT_BASE
TEXT_BASE = 0xFFFC0000
endif