From: Jon Loeliger <jdl@freescale.com>
Date: Tue, 19 Sep 2006 13:51:24 +0000 (-0500)
Subject: Merge branch 'master' of http://www.denx.de/git/u-boot
X-Git-Tag: U-Boot-1_1_6~20^2~3^2~22
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=afa98843e4665add11b69496341053b268156e3a;p=u-boot

Merge branch 'master' of http://www.denx.de/git/u-boot

Conflicts:

	board/stxxtc/Makefile
---

afa98843e4665add11b69496341053b268156e3a
diff --cc Makefile
index 8cc2664c43,ccf7f9f88f..c0621f6869
--- a/Makefile
+++ b/Makefile
@@@ -1466,24 -1636,17 +1639,25 @@@ TQM8540_config		
  TQM8541_config		\
  TQM8555_config		\
  TQM8560_config:		unconfig
+ 	@mkdir -p $(obj)include
  	@CTYPE=$(subst TQM,,$(@:_config=)); \
- 	>include/config.h ; \
+ 	>$(obj)include/config.h ; \
  	echo "... TQM"$${CTYPE}; \
- 	echo "#define CONFIG_MPC$${CTYPE}">>include/config.h; \
- 	echo "#define CONFIG_TQM$${CTYPE}">>include/config.h; \
- 	echo "#define CONFIG_HOSTNAME tqm$${CTYPE}">>include/config.h; \
- 	echo "#define CONFIG_BOARDNAME \"TQM$${CTYPE}\"">>include/config.h; \
- 	echo "#define CFG_BOOTFILE \"bootfile=/tftpboot/tqm$${CTYPE}/uImage\0\"">>include/config.h
- 	@./mkconfig -a TQM85xx ppc mpc85xx tqm85xx
+ 	echo "#define CONFIG_MPC$${CTYPE}">>$(obj)include/config.h; \
+ 	echo "#define CONFIG_TQM$${CTYPE}">>$(obj)include/config.h; \
+ 	echo "#define CONFIG_HOSTNAME tqm$${CTYPE}">>$(obj)include/config.h; \
+ 	echo "#define CONFIG_BOARDNAME \"TQM$${CTYPE}\"">>$(obj)include/config.h; \
+ 	echo "#define CFG_BOOTFILE \"bootfile=/tftpboot/tqm$${CTYPE}/uImage\0\"">>$(obj)include/config.h
+ 	@$(MKCONFIG) -a TQM85xx ppc mpc85xx tqm85xx
  
 +#########################################################################
 +## MPC86xx Systems
 +#########################################################################
 +
 +MPC8641HPCN_config:    unconfig
 +	@./mkconfig $(@:_config=) ppc mpc86xx mpc8641hpcn
 +
 +
  #########################################################################
  ## 74xx/7xx Systems
  #########################################################################
diff --cc board/cds/mpc8541cds/Makefile
index d202281d45,3f3a51721a..9aad5d5fa0
--- 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,3f3a51721a..9aad5d5fa0
--- 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,3f3a51721a..9aad5d5fa0
--- 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,807da06e6c..2951b96a21
--- 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)
+ SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
+ OBJS	:= $(addprefix $(obj),$(COBJS))
+ SOBJS	:= $(addprefix $(obj),$(SOBJS))
+ 
+ $(LIB):	$(obj).depend $(OBJS)
  	$(AR) crv $@ $(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
  
  #########################################################################
diff --cc common/Makefile
index a62bc16e85,d626fe4d4b..5ff8f93503
--- a/common/Makefile
+++ b/common/Makefile
@@@ -51,9 -51,10 +51,10 @@@ COBJS	= main.o ACEX1K.o altera.o bedbug
  	  memsize.o miiphybb.o miiphyutil.o \
  	  s_record.o serial.o soft_i2c.o soft_spi.o spartan2.o spartan3.o \
  	  usb.o usb_kbd.o usb_storage.o \
 -	  virtex2.o xilinx.o crc16.o xyzModem.o
 +	  virtex2.o xilinx.o crc16.o xyzModem.o cmd_mac.o
  
- OBJS	= $(AOBJS) $(COBJS)
+ SRCS	:= $(AOBJS:.o=.S) $(COBJS:.o=.c)
+ OBJS	:= $(addprefix $(obj),$(AOBJS) $(COBJS))
  
  CPPFLAGS += -I..