diff options
author | Wolfgang Denk <wd@pollux.denx.de> | 2006-09-03 23:03:57 (GMT) |
---|---|---|
committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-09-03 23:03:57 (GMT) |
commit | 6741ae92f37caea8a22d1dcfaeab356f94b64676 (patch) | |
tree | 8abb7ed1b67b2b75733e02a923a229ed8176863f /board/tqm5200 | |
parent | 360b4103677b27ad4018174a1d186218969d83a1 (diff) | |
parent | f93286397ed2a7084efb0362a43ee09f11702349 (diff) | |
download | u-boot-6741ae92f37caea8a22d1dcfaeab356f94b64676.tar.xz |
Merge with /home/m8/git/u-boot
Diffstat (limited to 'board/tqm5200')
-rw-r--r-- | board/tqm5200/Makefile | 18 | ||||
-rw-r--r-- | board/tqm5200/config.mk | 2 |
2 files changed, 12 insertions, 8 deletions
diff --git a/board/tqm5200/Makefile b/board/tqm5200/Makefile index 9a1ea48..d0dde26 100644 --- a/board/tqm5200/Makefile +++ b/board/tqm5200/Makefile @@ -1,5 +1,5 @@ # -# (C) Copyright 2003-2004 +# (C) Copyright 2003-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -23,11 +23,15 @@ include $(TOPDIR)/config.mk -LIB = lib$(BOARD).a +LIB = $(obj)lib$(BOARD).a -OBJS := $(BOARD).o cmd_stk52xx.o cmd_tb5200.o +COBJS := $(BOARD).o cmd_stk52xx.o cmd_tb5200.o -$(LIB): $(OBJS) $(SOBJS) +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) $(AR) crv $@ $(OBJS) clean: @@ -38,9 +42,9 @@ distclean: clean ######################################################################### -.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/tqm5200/config.mk b/board/tqm5200/config.mk index 84ddee8..d72dfe7 100644 --- a/board/tqm5200/config.mk +++ b/board/tqm5200/config.mk @@ -32,7 +32,7 @@ # 0x00100000 boot from RAM (for testing only) # -sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp +sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp ifndef TEXT_BASE ## Standard: boot low |