From: Wolfgang Denk <wd@nyx.denx.de>
Date: Wed, 11 Oct 2006 12:15:21 +0000 (+0200)
Subject: Merge with /home/wd/git/u-boot/master
X-Git-Tag: U-Boot-1_1_6~24
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fb883a521e04437acfe989de3e152b2e4866856b;p=oweals%2Fu-boot.git

Merge with /home/wd/git/u-boot/master
---

fb883a521e04437acfe989de3e152b2e4866856b
diff --cc board/cds/mpc8541cds/Makefile
index d202281d45,d65eb1b3e6..7f53098850
--- a/board/cds/mpc8541cds/Makefile
+++ b/board/cds/mpc8541cds/Makefile
@@@ -23,14 -23,15 +23,17 @@@
  #
  
  include $(TOPDIR)/config.mk
+ ifneq ($(OBJTREE),$(SRCTREE))
+ $(shell mkdir -p $(obj)../common)
+ endif
  
- LIB	= lib$(BOARD).a
+ LIB	= $(obj)lib$(BOARD).a
  
- OBJS	:= $(BOARD).o \
+ COBJS	:= $(BOARD).o \
  	   ../common/cadmus.o \
 -	   ../common/eeprom.o
 +	   ../common/eeprom.o \
 +	   ../common/ft_board.o \
 +	   ../common/via.o
  
  SOBJS	:= init.o
  
diff --cc board/cds/mpc8548cds/Makefile
index d202281d45,d65eb1b3e6..7f53098850
--- a/board/cds/mpc8548cds/Makefile
+++ b/board/cds/mpc8548cds/Makefile
@@@ -23,14 -23,15 +23,17 @@@
  #
  
  include $(TOPDIR)/config.mk
+ ifneq ($(OBJTREE),$(SRCTREE))
+ $(shell mkdir -p $(obj)../common)
+ endif
  
- LIB	= lib$(BOARD).a
+ LIB	= $(obj)lib$(BOARD).a
  
- OBJS	:= $(BOARD).o \
+ COBJS	:= $(BOARD).o \
  	   ../common/cadmus.o \
 -	   ../common/eeprom.o
 +	   ../common/eeprom.o \
 +	   ../common/ft_board.o \
 +	   ../common/via.o
  
  SOBJS	:= init.o
  
diff --cc board/cds/mpc8555cds/Makefile
index d202281d45,d65eb1b3e6..7f53098850
--- a/board/cds/mpc8555cds/Makefile
+++ b/board/cds/mpc8555cds/Makefile
@@@ -23,14 -23,15 +23,17 @@@
  #
  
  include $(TOPDIR)/config.mk
+ ifneq ($(OBJTREE),$(SRCTREE))
+ $(shell mkdir -p $(obj)../common)
+ endif
  
- LIB	= lib$(BOARD).a
+ LIB	= $(obj)lib$(BOARD).a
  
- OBJS	:= $(BOARD).o \
+ COBJS	:= $(BOARD).o \
  	   ../common/cadmus.o \
 -	   ../common/eeprom.o
 +	   ../common/eeprom.o \
 +	   ../common/ft_board.o \
 +	   ../common/via.o
  
  SOBJS	:= init.o
  
diff --cc board/stxxtc/Makefile
index 8c529a0611,b575e235e1..424ab1cf9e
--- a/board/stxxtc/Makefile
+++ b/board/stxxtc/Makefile
@@@ -23,18 -23,30 +23,22 @@@
  
  include $(TOPDIR)/config.mk
  
- LIB	= lib$(BOARD).a
+ LIB	= $(obj)lib$(BOARD).a
  
- OBJS	= $(BOARD).o
 -COBJS	= $(BOARD).o oftree.o
++COBJS	= $(BOARD).o
  
- $(LIB):	.depend $(OBJS)
- 	$(AR) crv $@ $(OBJS)
+ SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
+ OBJS	:= $(addprefix $(obj),$(COBJS))
+ SOBJS	:= $(addprefix $(obj),$(SOBJS))
+ 
+ $(LIB):	$(obj).depend $(OBJS)
+ 	$(AR) $(ARFLAGS) $@ $(OBJS)
  
 -$(obj)%.dtb: $(src)%.dts
 -	dtc -f -V 0x10 -I dts -O dtb $< >$@
 -
 -$(obj)%.c: $(obj)%.dtb
 -	xxd -i $< \
 -	   | sed -e "s/^unsigned char/const unsigned char/g" \
 -	   | sed -e "s/^unsigned int/const unsigned int/g" > $@
 -
  #########################################################################
  
- .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
  
  #########################################################################