kbuild: use shorten log for linking u-boot

Move sandbox-specific link rule to arch/sandbox/config.mk.

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

diff --git a/Makefile b/Makefile
index 091902cc886044c31fc6cffe545f7963c6d69b33..adb40e4512872546bda265e75f63105618226a2d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -738,7 +738,7 @@ endif
 endif
 endif
 
-LDFLAGS_u-boot += -T u-boot.lds $(LDFLAGS_FINAL)
+LDFLAGS_u-boot += $(LDFLAGS_FINAL)
 ifneq ($(CONFIG_SYS_TEXT_BASE),)
 LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE)
 endif
@@ -913,27 +913,22 @@ u-boot.elf: u-boot.bin
                --defsym=_start=$(CONFIG_SYS_TEXT_BASE) \
                -Ttext=$(CONFIG_SYS_TEXT_BASE)
 
-ifeq ($(CONFIG_SANDBOX),y)
-GEN_UBOOT = \
-               $(CC) $(SYMS) -T u-boot.lds \
-                       -Wl,--start-group $(u-boot-main) -Wl,--end-group \
-                       $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map -o u-boot
-else
-GEN_UBOOT = \
-               $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) \
-                       $(u-boot-init) \
-                       --start-group $(u-boot-main) --end-group $(PLATFORM_LIBS) \
-                       -Map u-boot.map -o u-boot
-endif
+# Rule to link u-boot
+# May be overridden by arch/$(ARCH)/config.mk
+quiet_cmd_u-boot__ ?= LD      $@
+      cmd_u-boot__ ?= $(LD) $(LDFLAGS) $(LDFLAGS_u-boot) -o $@ \
+      -T u-boot.lds $(u-boot-init)                             \
+      --start-group $(u-boot-main) --end-group                 \
+      $(PLATFORM_LIBS) -Map u-boot.map
 
 u-boot:        $(u-boot-init) $(u-boot-main) u-boot.lds
-               $(GEN_UBOOT)
+       $(call if_changed,u-boot__)
 ifeq ($(CONFIG_KALLSYMS),y)
-               smap=`$(call SYSTEM_MAP,u-boot) | \
-                       awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\\\000"}'` ; \
-               $(CC) $(c_flags) -DSYSTEM_MAP="\"$${smap}\"" \
-                       -c $(srctree)/common/system_map.c -o common/system_map.o
-               $(GEN_UBOOT) common/system_map.o
+       smap=`$(call SYSTEM_MAP,u-boot) | \
+               awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\\\000"}'` ; \
+       $(CC) $(c_flags) -DSYSTEM_MAP="\"$${smap}\"" \
+               -c $(srctree)/common/system_map.c -o common/system_map.o
+       $(call cmd,u-boot__) common/system_map.o
 endif
 
 # The actual objects are generated when descending, 

diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk
index 6142dd4c70de4d46045a4a179e4b7b684d060c31..23b057e6c4ae88c79ac03b7cfcafe45ffe0c04da 100644 (file)
--- a/arch/sandbox/config.mk
+++ b/arch/sandbox/config.mk
@@ -7,3 +7,7 @@ PLATFORM_LIBS += -lrt
 
 # Support generic board on sandbox
 __HAVE_ARCH_GENERIC_BOARD := y
+
+cmd_u-boot__ = $(CC) -o $@ -T u-boot.lds \
+       -Wl,--start-group $(u-boot-main) -Wl,--end-group \
+       $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map