Commit 04a34c96 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Tom Rini

kbuild: use shorten logs for misc targets

Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
parent ad0fed46
...@@ -1048,9 +1048,12 @@ depend dep: ...@@ -1048,9 +1048,12 @@ depend dep:
@echo '*** Warning: make $@ is unnecessary now.' @echo '*** Warning: make $@ is unnecessary now.'
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
quiet_cmd_cpp_lds = LDS $@
cmd_cpp_lds = $(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ \
-x assembler-with-cpp -P -o $@ $<
u-boot.lds: $(LDSCRIPT) prepare u-boot.lds: $(LDSCRIPT) prepare FORCE
$(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$< >$@ $(call if_changed,cpp_lds)
PHONY += nand_spl PHONY += nand_spl
nand_spl: prepare nand_spl: prepare
......
...@@ -37,5 +37,9 @@ ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS) ...@@ -37,5 +37,9 @@ ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
endif endif
CPPFLAGS_init.lds := -ansi CPPFLAGS_init.lds := -ansi
quiet_cmd_link_init = LD $@
cmd_link_init = $(LD) $(LDFLAGS) -T $^ -o $@
$(obj)/init.elf: $(obj)/init.lds $(obj)/init.o $(obj)/initcode.o $(obj)/init.elf: $(obj)/init.lds $(obj)/init.o $(obj)/initcode.o
$(LD) $(LDFLAGS) -T $^ -o $@ $(call if_changed,link_init)
targets += init.lds init.o
...@@ -15,30 +15,32 @@ endif ...@@ -15,30 +15,32 @@ endif
extra-y = demo extra-y = demo
# Source files located in the examples/api directory # Source files located in the examples/api directory
SOBJ_FILES-y += crt0.o OBJ-y += crt0.o
COBJ_FILES-y += demo.o OBJ-y += demo.o
COBJ_FILES-y += glue.o OBJ-y += glue.o
COBJ_FILES-y += libgenwrap.o OBJ-y += libgenwrap.o
# Source files which exist outside the examples/api directory # Source files which exist outside the examples/api directory
EXT_COBJ_FILES-y += lib/crc32.o EXT_COBJ-y += lib/crc32.o
EXT_COBJ_FILES-y += lib/ctype.o EXT_COBJ-y += lib/ctype.o
EXT_COBJ_FILES-y += lib/div64.o EXT_COBJ-y += lib/div64.o
EXT_COBJ_FILES-y += lib/string.o EXT_COBJ-y += lib/string.o
EXT_COBJ_FILES-y += lib/time.o EXT_COBJ-y += lib/time.o
EXT_COBJ_FILES-y += lib/vsprintf.o EXT_COBJ-y += lib/vsprintf.o
EXT_SOBJ_FILES-$(CONFIG_PPC) += arch/powerpc/lib/ppcstring.o EXT_SOBJ-$(CONFIG_PPC) += arch/powerpc/lib/ppcstring.o
# Create a list of object files to be compiled # Create a list of object files to be compiled
OBJS += $(addprefix $(obj)/,$(SOBJ_FILES-y)) OBJS := $(OBJ-y) $(notdir $(EXT_COBJ-y) $(EXT_SOBJ-y))
OBJS += $(addprefix $(obj)/,$(COBJ_FILES-y)) targets += $(OBJS)
OBJS += $(addprefix $(obj)/,$(notdir $(EXT_COBJ_FILES-y))) OBJS := $(addprefix $(obj)/,$(OBJS))
OBJS += $(addprefix $(obj)/,$(notdir $(EXT_SOBJ_FILES-y)))
######################################################################### #########################################################################
$(obj)/demo: $(OBJS) quiet_cmd_link_demo = LD $@
$(LD) --gc-sections -Ttext $(LOAD_ADDR) -o $@ $^ $(PLATFORM_LIBS) cmd_link_demo = $(LD) --gc-sections -Ttext $(LOAD_ADDR) -o $@ $(filter-out $(PHONY), $^) $(PLATFORM_LIBS)
$(obj)/demo: $(OBJS) FORCE
$(call if_changed,link_demo)
# demo.bin is never genrated. Is this necessary? # demo.bin is never genrated. Is this necessary?
OBJCOPYFLAGS_demo.bin := -O binary OBJCOPYFLAGS_demo.bin := -O binary
...@@ -46,10 +48,10 @@ $(obj)/demo.bin: $(obj)/demo FORCE ...@@ -46,10 +48,10 @@ $(obj)/demo.bin: $(obj)/demo FORCE
$(call if_changed,objcopy) $(call if_changed,objcopy)
# Rule to build generic library C files # Rule to build generic library C files
$(addprefix $(obj)/,$(notdir $(EXT_COBJ_FILES-y))): $(obj)/%.o: $(SRCTREE)/lib/%.c FORCE $(addprefix $(obj)/,$(notdir $(EXT_COBJ-y))): $(obj)/%.o: lib/%.c FORCE
$(call cmd,force_checksrc) $(call cmd,force_checksrc)
$(call if_changed_rule,cc_o_c) $(call if_changed_rule,cc_o_c)
# Rule to build architecture-specific library assembly files # Rule to build architecture-specific library assembly files
$(addprefix $(obj)/,$(notdir $(EXT_SOBJ_FILES-y))): $(obj)/%.o: $(SRCTREE)/arch/$(ARCH)/lib/%.S $(addprefix $(obj)/,$(notdir $(EXT_SOBJ-y))): $(obj)/%.o: arch/powerpc/lib/%.S FORCE
$(call if_changed_dep,as_o_S) $(call if_changed_dep,as_o_S)
...@@ -24,22 +24,18 @@ ELF := $(strip $(extra-y)) ...@@ -24,22 +24,18 @@ ELF := $(strip $(extra-y))
extra-y += $(addsuffix .srec,$(extra-y)) $(addsuffix .bin,$(extra-y)) extra-y += $(addsuffix .srec,$(extra-y)) $(addsuffix .bin,$(extra-y))
clean-files := $(extra-) $(addsuffix .srec,$(extra-)) $(addsuffix .bin,$(extra-)) clean-files := $(extra-) $(addsuffix .srec,$(extra-)) $(addsuffix .bin,$(extra-))
COBJS := $(ELF:=.o) COBJS := $(ELF:=.o)
LIB = $(obj)/libstubs.o LIB = $(obj)/libstubs.o
LIBAOBJS-$(CONFIG_PPC) += ppc_longjmp.o ppc_setjmp.o LIBOBJS-$(CONFIG_PPC) += ppc_longjmp.o ppc_setjmp.o
LIBAOBJS-$(CONFIG_8xx) += test_burst_lib.o LIBOBJS-$(CONFIG_8xx) += test_burst_lib.o
LIBAOBJS := $(LIBAOBJS-y) LIBOBJS-y += stubs.o
LIBCOBJS = stubs.o
.SECONDARY: $(call objectify,$(COBJS)) .SECONDARY: $(call objectify,$(COBJS))
targets += $(patsubst $(obj)/%,%,$(LIB)) $(COBJS) $(LIBAOBJS) $(LIBCOBJS) targets += $(patsubst $(obj)/%,%,$(LIB)) $(COBJS) $(LIBOBJS-y)
LIBOBJS = $(addprefix $(obj)/,$(LIBAOBJS) $(LIBCOBJS))
LIBOBJS := $(addprefix $(obj)/,$(LIBOBJS-y))
ELF := $(addprefix $(obj)/,$(ELF)) ELF := $(addprefix $(obj)/,$(ELF))
gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`) gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`)
...@@ -66,11 +62,12 @@ quiet_cmd_link_lib = LD $@ ...@@ -66,11 +62,12 @@ quiet_cmd_link_lib = LD $@
$(LIB): $(LIBOBJS) FORCE $(LIB): $(LIBOBJS) FORCE
$(call if_changed,link_lib) $(call if_changed,link_lib)
$(ELF): quiet_cmd_link_elf = LD $@
$(obj)/%: $(obj)/%.o $(LIB) cmd_link_elf = $(LD) $(LDFLAGS) -g -Ttext $(CONFIG_STANDALONE_LOAD_ADDR) \
$(LD) $(LDFLAGS) -g -Ttext $(CONFIG_STANDALONE_LOAD_ADDR) \ -o $@ -e $(SYM_PREFIX)$(@F) $< $(LIB) -L$(gcclibdir) -lgcc
-o $@ -e $(SYM_PREFIX)$(notdir $(<:.o=)) $< $(LIB) \
-L$(gcclibdir) -lgcc $(ELF): $(obj)/%: $(obj)/%.o $(LIB) FORCE
$(call if_changed,link_elf)
$(obj)/%.srec: OBJCOPYFLAGS := -O srec $(obj)/%.srec: OBJCOPYFLAGS := -O srec
$(obj)/%.srec: $(obj)/% FORCE $(obj)/%.srec: $(obj)/% FORCE
......
...@@ -234,8 +234,12 @@ $(u-boot-spl-dirs): ...@@ -234,8 +234,12 @@ $(u-boot-spl-dirs):
# FIX ME # FIX ME
cpp_flags := $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(UBOOTINCLUDE) $(NOSTDINC_FLAGS) cpp_flags := $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(UBOOTINCLUDE) $(NOSTDINC_FLAGS)
quiet_cmd_cpp_lds = LDS $@
cmd_cpp_lds = $(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ \
-x assembler-with-cpp -P -o $@ $<
$(obj)/u-boot-spl.lds: $(LDSCRIPT) FORCE $(obj)/u-boot-spl.lds: $(LDSCRIPT) FORCE
$(CPP) $(cpp_flags) $(LDPPFLAGS) -I$(obj). -ansi -D__ASSEMBLY__ -P - < $< > $@ $(call if_changed,cpp_lds)
# read all saved command lines # read all saved command lines
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment