summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiklaus Giger <niklaus.giger@netstal.com>2007-08-15 12:14:23 +0200
committerStefan Roese <sr@denx.de>2007-08-15 13:27:32 +0200
commit0e19209767194a97cec6d93dba9e64d1da8d548e (patch)
tree6a944ad1fff608e24088e8d5b8acdc4d74058872
parent594e79838ce5078a90d0c27abb2b2d61d5f8e8a7 (diff)
downloadblackbird-obmc-uboot-0e19209767194a97cec6d93dba9e64d1da8d548e.tar.gz
blackbird-obmc-uboot-0e19209767194a97cec6d93dba9e64d1da8d548e.zip
PPC4xx:HCU4/5-Board fix compile warning
Signed-off-by: Niklaus Giger <niklaus.giger@netstal.com>
-rw-r--r--board/netstal/common/hcu_flash.c (renamed from board/netstal/common/flash.c)0
-rw-r--r--board/netstal/hcu4/Makefile14
-rw-r--r--board/netstal/hcu5/Makefile14
3 files changed, 18 insertions, 10 deletions
diff --git a/board/netstal/common/flash.c b/board/netstal/common/hcu_flash.c
index be2cb37734..be2cb37734 100644
--- a/board/netstal/common/flash.c
+++ b/board/netstal/common/hcu_flash.c
diff --git a/board/netstal/hcu4/Makefile b/board/netstal/hcu4/Makefile
index d9825a5f25..af90821faa 100644
--- a/board/netstal/hcu4/Makefile
+++ b/board/netstal/hcu4/Makefile
@@ -22,16 +22,20 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-vpath flash.c ../common
-COBJS = $(BOARD).o flash.o
+vpath hcu_flash.c ../common
+
+# NOBJS : Netstal common objects
+NOBJS = hcu_flash.o
+COBJS = $(BOARD).o
SOBJS =
-SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) ../common/$(NOBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
+NOBJS := $(addprefix $(obj),$(NOBJS))
SOBJS := $(addprefix $(obj),$(SOBJS))
-$(LIB): $(OBJS) $(SOBJS)
- $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
+$(LIB): $(OBJS) $(SOBJS) $(NOBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) $(NOBJS)
clean:
rm -f $(SOBJS) $(OBJS)
diff --git a/board/netstal/hcu5/Makefile b/board/netstal/hcu5/Makefile
index eee310b1a1..27398b905b 100644
--- a/board/netstal/hcu5/Makefile
+++ b/board/netstal/hcu5/Makefile
@@ -22,16 +22,20 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-vpath flash.c ../common
-COBJS = $(BOARD).o sdram.o flash.o
+vpath hcu_flash.c ../common
+
+# NOBJS : Netstal common objects
+NOBJS = hcu_flash.o
+COBJS = $(BOARD).o sdram.o
SOBJS = init.o
-SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) ../common/$(NOBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
+NOBJS := $(addprefix $(obj),$(NOBJS))
SOBJS := $(addprefix $(obj),$(SOBJS))
-$(LIB): $(OBJS) $(SOBJS)
- $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
+$(LIB): $(OBJS) $(SOBJS) $(NOBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) $(NOBJS)
clean:
rm -f $(SOBJS) $(OBJS)
OpenPOWER on IntegriCloud