Patchwork [U-Boot] SMDKV310: MMC_SPL: Fix building when using "make O="

login
register
mail settings
Submitter Chander Kashyap
Date June 3, 2011, 4:07 a.m.
Message ID <1307074052-2287-1-git-send-email-chander.kashyap@linaro.org>
Download mbox | patch
Permalink /patch/98519/
State Accepted
Commit 43c52f9f94b2678e46ebb1ee2d2242de1c7f513b
Delegated to: Albert ARIBAUD
Headers show

Comments

Chander Kashyap - June 3, 2011, 4:07 a.m.
Fixes dependency build error with "make O=" option.
"make O=" option is used to specify output directory.

Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
---
 mmc_spl/board/samsung/smdkv310/Makefile |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
Albert ARIBAUD - Aug. 4, 2011, 9:53 a.m.
On 03/06/2011 06:07, Chander Kashyap wrote:
> Fixes dependency build error with "make O=" option.
> "make O=" option is used to specify output directory.
>
> Signed-off-by: Chander Kashyap<chander.kashyap@linaro.org>
> ---
>   mmc_spl/board/samsung/smdkv310/Makefile |   12 ++++++------
>   1 files changed, 6 insertions(+), 6 deletions(-)

Applied to u-boot-arm/master, thanks!

Amicalement,

Patch

diff --git a/mmc_spl/board/samsung/smdkv310/Makefile b/mmc_spl/board/samsung/smdkv310/Makefile
index f1ce066..d4d7ad7 100644
--- a/mmc_spl/board/samsung/smdkv310/Makefile
+++ b/mmc_spl/board/samsung/smdkv310/Makefile
@@ -40,7 +40,7 @@  CFLAGS	+= -DCONFIG_PRELOADER
 SOBJS	= start.o mem_setup.o lowlevel_init.o
 COBJS	= mmc_boot.o
 
-SRCS	:= $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c))
+SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
 __OBJS	:= $(SOBJS) $(COBJS)
 LNDIR	:= $(OBJTREE)/mmc_spl/board/$(BOARDDIR)
@@ -76,25 +76,25 @@  $(mmcobj)u-boot.lds: $(LDSCRIPT)
 # create symbolic links for common files
 
 # from cpu directory
-$(obj)start.S:
+start.S:
 	@rm -f $@
 	@ln -s $(TOPDIR)/arch/arm/cpu/armv7/start.S $@
 
 # from board directory
-$(obj)mem_setup.S:
+mem_setup.S:
 	@rm -f $@
 	@ln -s $(TOPDIR)/board/samsung/smdkv310/mem_setup.S $@
 
-$(obj)lowlevel_init.S:
+lowlevel_init.S:
 	@rm -f $@
 	@ln -s $(TOPDIR)/board/samsung/smdkv310/lowlevel_init.S $@
 
 #########################################################################
 
-$(obj)%.o:	$(obj)%.S
+$(obj)%.o:	%.S
 	$(CC) $(AFLAGS) -c -o $@ $<
 
-$(obj)%.o:	$(obj)%.c
+$(obj)%.o:	%.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 # defines $(obj).depend target