From: Nobuhiro Iwamatsu Date: Tue, 2 Oct 2012 16:40:39 +0000 (+0000) Subject: rmobile: Fix build timer driver with BUILD_DIR X-Git-Tag: v2012.10-rc3~15^2~16 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=35729c6cb310d8bdfcf32ec0c23f226c714efda3;p=u-boot rmobile: Fix build timer driver with BUILD_DIR Rmobile common timer driver diverts the same driver as SH architecture. When it builds at the same place with source, it is no problem, but when it builds out of source, it cannot build. This patch revises this problem. Reported-by: Albert ARIBAUD Signed-off-by: Nobuhiro Iwamatsu --- diff --git a/arch/arm/cpu/armv7/rmobile/Makefile b/arch/arm/cpu/armv7/rmobile/Makefile index 00610fe87b..c8999bb300 100644 --- a/arch/arm/cpu/armv7/rmobile/Makefile +++ b/arch/arm/cpu/armv7/rmobile/Makefile @@ -35,11 +35,12 @@ COBJS-$(CONFIG_R8A7740) += cpu_info-r8a7740.o COBJS-$(CONFIG_R8A7740) += pfc-r8a7740.o COBJS-$(CONFIG_SH73A0) += cpu_info-sh73a0.o COBJS-$(CONFIG_SH73A0) += pfc-sh73a0.o -COBJS-$(CONFIG_TMU_TIMER) += $(TOPDIR)/arch/sh/lib/time.o +COBJS_LN-$(CONFIG_TMU_TIMER) += sh_timer.o COBJS := $(COBJS-y) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) $(addprefix $(obj),$(COBJS_LN-y:.o=.c)) +OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS) $(COBJS_LN-y)) SOBJS := $(addprefix $(obj),$(SOBJS)) START := $(addprefix $(obj),$(START)) @@ -48,6 +49,11 @@ all: $(obj).depend $(LIB) $(LIB): $(OBJS) $(call cmd_link_o_target, $(OBJS)) +# from arch/sh/lib/ directory +$(obj)sh_timer.c: + @rm -f $(obj)sh_timer.c + ln -s $(SRCTREE)/arch/sh/lib/time.c $(obj)sh_timer.c + ######################################################################### # defines $(obj).depend target