Merge with /home/wd/git/u-boot/master
authorWolfgang Denk <wd@nyx.denx.de>
Wed, 11 Oct 2006 12:15:21 +0000 (14:15 +0200)
committerWolfgang Denk <wd@nyx.denx.de>
Wed, 11 Oct 2006 12:15:21 +0000 (14:15 +0200)
1  2 
README
board/cds/mpc8541cds/Makefile
board/cds/mpc8548cds/Makefile
board/cds/mpc8555cds/Makefile
board/stxxtc/Makefile
common/cmd_bootm.c
common/ft_build.c
include/image.h
tools/mkimage.c

diff --cc README
Simple merge
index d202281d454d3f27f6f2e32a8bb82bef83dfd29c,d65eb1b3e691fd7f08f81b0efb88e65244c4d307..7f530988505d39b324834a910f5562d0faf1dad1
  #
  
  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
  
index d202281d454d3f27f6f2e32a8bb82bef83dfd29c,d65eb1b3e691fd7f08f81b0efb88e65244c4d307..7f530988505d39b324834a910f5562d0faf1dad1
  #
  
  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
  
index d202281d454d3f27f6f2e32a8bb82bef83dfd29c,d65eb1b3e691fd7f08f81b0efb88e65244c4d307..7f530988505d39b324834a910f5562d0faf1dad1
  #
  
  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
  
index 8c529a0611d101d868c380548d562a17edaecc23,b575e235e13777a07f6f5b67fe63db261f88e3f3..424ab1cf9e3251575e95a3faf767cfc87b765cf2
  
  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
  
  #########################################################################
Simple merge
Simple merge
diff --cc include/image.h
Simple merge
diff --cc tools/mkimage.c
Simple merge