浏览代码

ppc4xx: HCU4/5. Fix make O=../xx

Signed-off-by: Niklaus Giger <niklaus.giger@netstal.com>
Niklaus Giger 17 年之前
父节点
当前提交
b7f6193e76
共有 3 个文件被更改,包括 10 次插入14 次删除
  1. 2 0
      Makefile
  2. 4 8
      board/netstal/hcu4/Makefile
  3. 4 6
      board/netstal/hcu5/Makefile

+ 2 - 0
Makefile

@@ -1225,9 +1225,11 @@ G2000_config:	unconfig
 	@$(MKCONFIG) $(@:_config=) ppc ppc4xx g2000
 	@$(MKCONFIG) $(@:_config=) ppc ppc4xx g2000
 
 
 hcu4_config:	unconfig
 hcu4_config:	unconfig
+	@mkdir -p $(obj)board/netstal/common
 	@$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu4 netstal
 	@$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu4 netstal
 
 
 hcu5_config:	unconfig
 hcu5_config:	unconfig
+	@mkdir -p $(obj)board/netstal/common
 	@$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu5 netstal
 	@$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu5 netstal
 
 
 HH405_config:	unconfig
 HH405_config:	unconfig

+ 4 - 8
board/netstal/hcu4/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# (C) Copyright 2007 Netstal Maschinen AG
+# (C) Copyright 2007-2008 Netstal Maschinen AG
 # Niklaus Giger (ng@netstal.com)
 # Niklaus Giger (ng@netstal.com)
 #
 #
 # This program is free software; you can redistribute it and/or
 # This program is free software; you can redistribute it and/or
@@ -22,18 +22,14 @@ include $(TOPDIR)/config.mk
 
 
 LIB	= $(obj)lib$(BOARD).a
 LIB	= $(obj)lib$(BOARD).a
 
 
-vpath fixed_sdram.c ../common
-vpath hcu_flash.c ../common
-vpath nm_bsp.c ../common
-
 # NOBJS : Netstal common objects
 # NOBJS : Netstal common objects
-NOBJS	= ../common/fixed_sdram.o ../common/hcu_flash.o ../common/nm_bsp.o
+NOBJS	= fixed_sdram.o hcu_flash.o nm_bsp.o
 COBJS	= $(BOARD).o
 COBJS	= $(BOARD).o
 SOBJS	=
 SOBJS	=
 
 
-SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) $(NOBJS:.o=.c)
+SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) $(addprefix ../common/,$(NOBJS:.o=.c))
 OBJS	:= $(addprefix $(obj),$(COBJS))
 OBJS	:= $(addprefix $(obj),$(COBJS))
-NOBJS	:= $(addprefix $(obj),$(NOBJS))
+NOBJS	:= $(addprefix $(obj)../common/,$(NOBJS))
 SOBJS	:= $(addprefix $(obj),$(SOBJS))
 SOBJS	:= $(addprefix $(obj),$(SOBJS))
 
 
 $(LIB):	$(OBJS) $(SOBJS) $(NOBJS)
 $(LIB):	$(OBJS) $(SOBJS) $(NOBJS)

+ 4 - 6
board/netstal/hcu5/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# (C) Copyright 2007 Netstal Maschinen AG
+# (C) Copyright 2007-2008 Netstal Maschinen AG
 # Niklaus Giger (ng@netstal.com)
 # Niklaus Giger (ng@netstal.com)
 #
 #
 # This program is free software; you can redistribute it and/or
 # This program is free software; you can redistribute it and/or
@@ -22,17 +22,15 @@ include $(TOPDIR)/config.mk
 
 
 LIB	= $(obj)lib$(BOARD).a
 LIB	= $(obj)lib$(BOARD).a
 
 
-vpath hcu_flash.c ../common
-vpath nm_bsp.c ../common
 
 
 # NOBJS : Netstal common objects
 # NOBJS : Netstal common objects
-NOBJS	= ../common/hcu_flash.o ../common/nm_bsp.o
+NOBJS	= hcu_flash.o nm_bsp.o
 COBJS	= $(BOARD).o sdram.o
 COBJS	= $(BOARD).o sdram.o
 SOBJS	= init.o
 SOBJS	= init.o
 
 
-SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) $(NOBJS:.o=.c)
+SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) $(addprefix ../common/,$(NOBJS:.o=.c))
 OBJS	:= $(addprefix $(obj),$(COBJS))
 OBJS	:= $(addprefix $(obj),$(COBJS))
-NOBJS	:= $(addprefix $(obj),$(NOBJS))
+NOBJS	:= $(addprefix $(obj)../common/,$(NOBJS))
 SOBJS	:= $(addprefix $(obj),$(SOBJS))
 SOBJS	:= $(addprefix $(obj),$(SOBJS))
 
 
 $(LIB):	$(OBJS) $(SOBJS) $(NOBJS)
 $(LIB):	$(OBJS) $(SOBJS) $(NOBJS)