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

[u-boot] / board / cray / L1 / Makefile

diff --git a/board/cray/L1/Makefile b/board/cray/L1/Makefile
index 4c09eddd91be85bcbfd37228a8457fa87b14161a..9e6461ace1956d1b44bcd1fa607ddd157cbb0f24 100644 (file)
--- a/board/cray/L1/Makefile
+++ b/board/cray/L1/Makefile
@@ -1,57 +1,40 @@
 #
-# (C) Copyright 2000
+# (C) Copyright 2000-2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
+# SPDX-License-Identifier:     GPL-2.0+
 #
 
 include $(TOPDIR)/config.mk
 
-LIB    = lib$(BOARD).a
-
-OBJS   = $(BOARD).o flash.o bootscript.o
-SOBJS  = init.o 
+LIB    = $(obj)lib$(BOARD).o
 
-$(LIB):        $(OBJS) $(SOBJS)
-       $(AR) crv $@ $^
+COBJS  = $(BOARD).o flash.o
+SOBJS  = init.o
 
-clean:
-       rm -f $(SOBJS) $(OBJS) bootscript.c bootscript.image
 
-distclean:     clean
-       rm -f $(LIB) core *.bak .depend
+SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS))
+SOBJS  := $(addprefix $(obj),$(SOBJS))
 
-$(BOARD).o: $(BOARD).c bootscript.o
+# HACK: depend needs bootscript.c, which needs tools/mkimage, which is not
+# built in the depend stage.  So... put bootscript.o here, not in OBJS
+$(LIB):        $(OBJS) $(SOBJS) $(obj)bootscript.o
+       $(call cmd_link_o_target, $^)
 
-bootscript.o: bootscript.c
+$(obj)$(BOARD).o : $(src)$(BOARD).c $(obj)bootscript.o
 
-bootscript.c: bootscript.image
+$(obj)bootscript.c: $(obj)bootscript.image
        od -t x1 -v -A x $^ | awk -f x2c.awk > $@
 
-bootscript.image: bootscript.hush Makefile
-       -$(TOPDIR)/tools/mkimage -A ppc -O linux -T script -C none -a 0 -e 0 -n bootscript -d  bootscript.hush $@
+$(obj)bootscript.image: $(src)bootscript.hush $(src)Makefile
+       -$(OBJTREE)/tools/mkimage -A ppc -O linux -T script -C none -a 0 -e 0 -n bootscript -d $(src)bootscript.hush $@
 
 #########################################################################
 
-.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
 
 #########################################################################