浏览代码

sh: Fix up rsk7203 target for out of tree build

Fix up rsk7203 target to build successfully using out-of-tree build.

Signed-off-by: Kieran Bingham <kbingham@mpc-data.co.uk>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Kieran Bingham 16 年之前
父节点
当前提交
a5b04d00bf
共有 3 个文件被更改,包括 19 次插入10 次删除
  1. 2 2
      Makefile
  2. 4 0
      board/renesas/rsk7203/Makefile
  3. 13 8
      cpu/sh2/Makefile

+ 2 - 2
Makefile

@@ -3230,8 +3230,8 @@ mimc200_config		:	unconfig
 ## sh2 (Renesas SuperH)
 ## sh2 (Renesas SuperH)
 #########################################################################
 #########################################################################
 rsk7203_config: unconfig
 rsk7203_config: unconfig
-	@ >include/config.h
-	@echo "#define CONFIG_RSK7203 1" >> include/config.h
+	@mkdir -p $(obj)include
+	@echo "#define CONFIG_RSK7203 1" > $(obj)/include/config.h
 	@$(MKCONFIG) -a $(@:_config=) sh sh2 rsk7203 renesas
 	@$(MKCONFIG) -a $(@:_config=) sh sh2 rsk7203 renesas
 
 
 #########################################################################
 #########################################################################

+ 4 - 0
board/renesas/rsk7203/Makefile

@@ -26,6 +26,10 @@ LIB	= lib$(BOARD).a
 OBJS	:= rsk7203.o
 OBJS	:= rsk7203.o
 SOBJS	:= lowlevel_init.o
 SOBJS	:= lowlevel_init.o
 
 
+LIB	:= $(addprefix $(obj),$(LIB))
+OBJS	:= $(addprefix $(obj),$(OBJS))
+SOBJS	:= $(addprefix $(obj),$(SOBJS))
+
 $(LIB):	$(obj).depend $(OBJS) $(SOBJS)
 $(LIB):	$(obj).depend $(OBJS) $(SOBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
 
 

+ 13 - 8
cpu/sh2/Makefile

@@ -28,18 +28,23 @@ include $(TOPDIR)/config.mk
 
 
 LIB	= $(obj)lib$(CPU).a
 LIB	= $(obj)lib$(CPU).a
 
 
-START	= start.o
-OBJS	= cpu.o interrupts.o watchdog.o
+SOBJS	= start.o
+COBJS	= cpu.o interrupts.o watchdog.o
 
 
-all:	.depend $(START) $(LIB)
+SRCS    := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS    := $(addprefix $(obj),$(COBJS))
+SOBJS   := $(addprefix $(obj),$(SOBJS))
 
 
-$(LIB):	$(OBJS)
-	$(AR) $(ARFLAGS) $@ $(OBJS)
+$(LIB):	$(OBJS) $(SOBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
 
 
-#########################################################################
+clean:
+	rm -f $(SOBJS) $(OBJS)
+
+distclean:	clean
+	rm -f $(LIB) core *.bak $(obj).depend
 
 
-.depend:	Makefile $(START:.o=.S) $(OBJS:.o=.c)
-		$(CC) -M $(CFLAGS) $(START:.o=.S) $(OBJS:.o=.c) > $@
+#########################################################################
 
 
 # defines $(obj).depend target
 # defines $(obj).depend target
 include $(SRCTREE)/rules.mk
 include $(SRCTREE)/rules.mk