From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Mon, 11 Nov 2013 05:35:55 +0000 (+0900)
Subject: Makefile: merge $(LIBBOARD) into $(LIBS)
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=08e39a8434ff22d3851c1f9326b0e9afa5de0bee;p=u-boot.git

Makefile: merge $(LIBBOARD) into $(LIBS)

We do not need to handle $(LIBBOARD) and $(LIBS) separately.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

diff --git a/Makefile b/Makefile
index e12f1807f4..419278aad0 100644
--- a/Makefile
+++ b/Makefile
@@ -306,12 +306,11 @@ endif
 
 LIBS-$(CONFIG_ARM) += arch/arm/cpu/libcpu.o
 
+LIBS-y += board/$(BOARDDIR)/lib$(BOARD).o
+
 LIBS := $(addprefix $(obj),$(sort $(LIBS-y)))
 .PHONY : $(LIBS)
 
-LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o
-LIBBOARD := $(addprefix $(obj),$(LIBBOARD))
-
 # Add GCC lib
 ifdef USE_PRIVATE_LIBGCC
 ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
@@ -335,7 +334,7 @@ LDPPFLAGS += \
 	  sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p')
 
 __OBJS := $(subst $(obj),,$(OBJS))
-__LIBS := $(subst $(obj),,$(LIBS)) $(subst $(obj),,$(LIBBOARD))
+__LIBS := $(subst $(obj),,$(LIBS))
 
 #########################################################################
 #########################################################################
@@ -549,7 +548,7 @@ GEN_UBOOT = \
 endif
 
 $(obj)u-boot:	depend \
-		$(SUBDIR_TOOLS) $(OBJS) $(LIBBOARD) $(LIBS) $(LDSCRIPT) $(obj)u-boot.lds
+		$(SUBDIR_TOOLS) $(OBJS) $(LIBS) $(LDSCRIPT) $(obj)u-boot.lds
 		$(GEN_UBOOT)
 ifeq ($(CONFIG_KALLSYMS),y)
 		smap=`$(call SYSTEM_MAP,$(obj)u-boot) | \
@@ -566,10 +565,6 @@ $(LIBS):	depend $(SUBDIR_TOOLS)
 		$(MAKE) $(build) $(dir $(subst $(obj),,$@))
 		mv $(dir $@)built-in.o $@
 
-$(LIBBOARD):	depend $(LIBS)
-		$(MAKE) $(build) $(dir $(subst $(obj),,$@))
-		mv $(dir $@)built-in.o $@
-
 $(SUBDIRS):	depend
 		$(MAKE) -C $@ all