kbuild: use shorten logs objcopy rules

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

kbuild: use shorten logs objcopy rules
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Masahiro Yamada · Tom Rini
1 parent 03c7b3fc0b
Showing 4 changed files with 56 additions and 20 deletions Side-by-side Diff
Makefile
examples/api/Makefile
examples/standalone/Makefile
spl/Makefile
@@ -743,6 +743,9 @@
 LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE)
 endif
  
+quiet_cmd_objcopy = OBJCOPY $@
+cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
+
 all:		$(ALL-y)
  
 PHONY += dtbs
  
  
  
  
  
  
@@ -752,28 +755,32 @@
 u-boot-dtb.bin: u-boot.bin dts/dt.dtb
 		cat $^ >$@
  
-u-boot.hex:	u-boot
-		$(OBJCOPY) $(OBJCOPYFLAGS) -O ihex $< $@
+OBJCOPYFLAGS_u-boot.hex := -O ihex
  
-u-boot.srec:	u-boot
-		$(OBJCOPY) $(OBJCOPYFLAGS) -O srec $< $@
+OBJCOPYFLAGS_u-boot.srec := -O srec
  
-u-boot.bin:	u-boot
-		$(OBJCOPY) $(OBJCOPYFLAGS) -O binary $< $@
-		$(call DO_STATIC_RELA,$<,$@,$(CONFIG_SYS_TEXT_BASE))
-		$(BOARD_SIZE_CHECK)
+u-boot.hex u-boot.srec: u-boot FORCE
+	$(call if_changed,objcopy)
  
+OBJCOPYFLAGS_u-boot.bin := -O binary
+
+u-boot.bin: u-boot FORCE
+	$(call if_changed,objcopy)
+	$(call DO_STATIC_RELA,$<,$@,$(CONFIG_SYS_TEXT_BASE))
+	$(BOARD_SIZE_CHECK)
+
 u-boot.ldr:	u-boot
 		$(CREATE_LDR_ENV)
 		$(LDR) -T $(CONFIG_BFIN_CPU) -c $@ $< $(LDR_FLAGS)
 		$(BOARD_SIZE_CHECK)
  
-u-boot.ldr.hex:	u-boot.ldr
-		$(OBJCOPY) $(OBJCOPYFLAGS) -O ihex $< $@ -I binary
+OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihex
  
-u-boot.ldr.srec:	u-boot.ldr
-		$(OBJCOPY) $(OBJCOPYFLAGS) -O srec $< $@ -I binary
+OBJCOPYFLAGS_u-boot.ldr.srec := -I binary -O srec
  
+u-boot.ldr.hex u-boot.ldr.srec: u-boot.ldr FORCE
+	$(call if_changed,objcopy)
+
 #
 # U-Boot entry point, needed for booting of full-blown U-Boot
 # from the SPL U-Boot version.
@@ -1252,6 +1259,16 @@
  
 quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN   $(wildcard $(rm-files)))
       cmd_rmfiles = rm -f $(rm-files)
+
+# read all saved command lines
+
+targets := $(wildcard $(sort $(targets)))
+cmd_files := $(wildcard .*.cmd $(foreach f,$(targets),$(dir $(f)).$(notdir $(f)).cmd))
+
+ifneq ($(cmd_files),)
+  $(cmd_files): ;	# Do not try to update included dependency files
+  include $(cmd_files)
+endif
  
 # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj=dir
 # Usage:
@@ -40,8 +40,10 @@
 $(obj)/demo:	$(OBJS)
 		$(LD) --gc-sections -Ttext $(LOAD_ADDR) -o $@ $^ $(PLATFORM_LIBS)
  
-$(obj)/demo.bin: $(obj)/demo
-		$(OBJCOPY) -O binary $< $@ 2>/dev/null
+# demo.bin is never genrated. Is this necessary?
+OBJCOPYFLAGS_demo.bin := -O binary
+$(obj)/demo.bin: $(obj)/demo FORCE
+	$(call if_changed,objcopy)
  
 # Rule to build generic library C files
 $(addprefix $(obj)/,$(notdir $(EXT_COBJ_FILES-y))): $(obj)/%.o: $(SRCTREE)/lib/%.c FORCE
@@ -72,9 +72,11 @@
 			-o $@ -e $(SYM_PREFIX)$(notdir $(<:.o=)) $< $(LIB) \
 			-L$(gcclibdir) -lgcc
  
-$(obj)/%.srec:	$(obj)/%
-		$(OBJCOPY) -O srec $< $@ 2>/dev/null
+$(obj)/%.srec: OBJCOPYFLAGS := -O srec
+$(obj)/%.srec: $(obj)/% FORCE
+	$(call if_changed,objcopy)
  
-$(obj)/%.bin:	$(obj)/%
-		$(OBJCOPY) -O binary $< $@ 2>/dev/null
+$(obj)/%.bin: OBJCOPYFLAGS := -O binary
+$(obj)/%.bin: $(obj)/% FORCE
+	$(call if_changed,objcopy)
@@ -200,9 +200,14 @@
 	$(OBJTREE)/tools/mkexynosspl) $(VAR_SIZE_PARAM) $< $@
 endif
  
-$(obj)/$(SPL_BIN).bin:	$(obj)/$(SPL_BIN)
-	$(OBJCOPY) $(OBJCOPYFLAGS) $(SPL_OBJCFLAGS) -O binary $< $@
+quiet_cmd_objcopy = OBJCOPY $@
+cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
  
+OBJCOPYFLAGS_$(SPL_BIN).bin = $(SPL_OBJCFLAGS) -O binary
+
+$(obj)/$(SPL_BIN).bin: $(obj)/$(SPL_BIN) FORCE
+	$(call if_changed,objcopy)
+
 LDFLAGS_$(SPL_BIN) += -T u-boot-spl.lds $(LDFLAGS_FINAL)
 ifneq ($(CONFIG_SPL_TEXT_BASE),)
 LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE)
@@ -228,6 +233,16 @@
  
 $(obj)/u-boot-spl.lds: $(LDSCRIPT) FORCE
 	$(CPP) $(cpp_flags) $(LDPPFLAGS) -I$(obj). -ansi -D__ASSEMBLY__ -P - < $< > $@
+
+# read all saved command lines
+
+targets := $(wildcard $(sort $(targets)))
+cmd_files := $(wildcard $(obj)/.*.cmd $(foreach f,$(targets),$(dir $(f)).$(notdir $(f)).cmd))
+
+ifneq ($(cmd_files),)
+  $(cmd_files): ;	# Do not try to update included dependency files
+  include $(cmd_files)
+endif
  
 PHONY += FORCE
 FORCE:
...	...	@@ -743,6 +743,9 @@
743	743	LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE)
744	744	endif
745	745
	746	+quiet_cmd_objcopy = OBJCOPY $@
	747	+cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
	748	+
746	749	all: $(ALL-y)
747	750
748	751	PHONY += dtbs
749	752
750	753
751	754
752	755
753	756
754	757
...	...	@@ -752,28 +755,32 @@
752	755	u-boot-dtb.bin: u-boot.bin dts/dt.dtb
753	756	cat $^ >$@
754	757
755		-u-boot.hex: u-boot
756		- $(OBJCOPY) $(OBJCOPYFLAGS) -O ihex $< $@
	758	+OBJCOPYFLAGS_u-boot.hex := -O ihex
757	759
758		-u-boot.srec: u-boot
759		- $(OBJCOPY) $(OBJCOPYFLAGS) -O srec $< $@
	760	+OBJCOPYFLAGS_u-boot.srec := -O srec
760	761
761		-u-boot.bin: u-boot
762		- $(OBJCOPY) $(OBJCOPYFLAGS) -O binary $< $@
763		- $(call DO_STATIC_RELA,$<,$@,$(CONFIG_SYS_TEXT_BASE))
764		- $(BOARD_SIZE_CHECK)
	762	+u-boot.hex u-boot.srec: u-boot FORCE
	763	+ $(call if_changed,objcopy)
765	764
	765	+OBJCOPYFLAGS_u-boot.bin := -O binary
	766	+
	767	+u-boot.bin: u-boot FORCE
	768	+ $(call if_changed,objcopy)
	769	+ $(call DO_STATIC_RELA,$<,$@,$(CONFIG_SYS_TEXT_BASE))
	770	+ $(BOARD_SIZE_CHECK)
	771	+
766	772	u-boot.ldr: u-boot
767	773	$(CREATE_LDR_ENV)
768	774	$(LDR) -T $(CONFIG_BFIN_CPU) -c $@ $< $(LDR_FLAGS)
769	775	$(BOARD_SIZE_CHECK)
770	776
771		-u-boot.ldr.hex: u-boot.ldr
772		- $(OBJCOPY) $(OBJCOPYFLAGS) -O ihex $< $@ -I binary
	777	+OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihex
773	778
774		-u-boot.ldr.srec: u-boot.ldr
775		- $(OBJCOPY) $(OBJCOPYFLAGS) -O srec $< $@ -I binary
	779	+OBJCOPYFLAGS_u-boot.ldr.srec := -I binary -O srec
776	780
	781	+u-boot.ldr.hex u-boot.ldr.srec: u-boot.ldr FORCE
	782	+ $(call if_changed,objcopy)
	783	+
777	784	#
778	785	# U-Boot entry point, needed for booting of full-blown U-Boot
779	786	# from the SPL U-Boot version.
...	...	@@ -1252,6 +1259,16 @@
1252	1259
1253	1260	quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)))
1254	1261	cmd_rmfiles = rm -f $(rm-files)
	1262	+
	1263	+# read all saved command lines
	1264	+
	1265	+targets := $(wildcard $(sort $(targets)))
	1266	+cmd_files := $(wildcard .*.cmd $(foreach f,$(targets),$(dir $(f)).$(notdir $(f)).cmd))
	1267	+
	1268	+ifneq ($(cmd_files),)
	1269	+ $(cmd_files): ; # Do not try to update included dependency files
	1270	+ include $(cmd_files)
	1271	+endif
1255	1272
1256	1273	# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj=dir
1257	1274	# Usage:
...	...	@@ -40,8 +40,10 @@
40	40	$(obj)/demo: $(OBJS)
41	41	$(LD) --gc-sections -Ttext $(LOAD_ADDR) -o $@ $^ $(PLATFORM_LIBS)
42	42
43		-$(obj)/demo.bin: $(obj)/demo
44		- $(OBJCOPY) -O binary $< $@ 2>/dev/null
	43	+# demo.bin is never genrated. Is this necessary?
	44	+OBJCOPYFLAGS_demo.bin := -O binary
	45	+$(obj)/demo.bin: $(obj)/demo FORCE
	46	+ $(call if_changed,objcopy)
45	47
46	48	# Rule to build generic library C files
47	49	$(addprefix $(obj)/,$(notdir $(EXT_COBJ_FILES-y))): $(obj)/%.o: $(SRCTREE)/lib/%.c FORCE
...	...	@@ -72,9 +72,11 @@
72	72	-o $@ -e $(SYM_PREFIX)$(notdir $(<:.o=)) $< $(LIB) \
73	73	-L$(gcclibdir) -lgcc
74	74
75		-$(obj)/%.srec: $(obj)/%
76		- $(OBJCOPY) -O srec $< $@ 2>/dev/null
	75	+$(obj)/%.srec: OBJCOPYFLAGS := -O srec
	76	+$(obj)/%.srec: $(obj)/% FORCE
	77	+ $(call if_changed,objcopy)
77	78
78		-$(obj)/%.bin: $(obj)/%
79		- $(OBJCOPY) -O binary $< $@ 2>/dev/null
	79	+$(obj)/%.bin: OBJCOPYFLAGS := -O binary
	80	+$(obj)/%.bin: $(obj)/% FORCE
	81	+ $(call if_changed,objcopy)
...	...	@@ -200,9 +200,14 @@
200	200	$(OBJTREE)/tools/mkexynosspl) $(VAR_SIZE_PARAM) $< $@
201	201	endif
202	202
203		-$(obj)/$(SPL_BIN).bin: $(obj)/$(SPL_BIN)
204		- $(OBJCOPY) $(OBJCOPYFLAGS) $(SPL_OBJCFLAGS) -O binary $< $@
	203	+quiet_cmd_objcopy = OBJCOPY $@
	204	+cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
205	205
	206	+OBJCOPYFLAGS_$(SPL_BIN).bin = $(SPL_OBJCFLAGS) -O binary
	207	+
	208	+$(obj)/$(SPL_BIN).bin: $(obj)/$(SPL_BIN) FORCE
	209	+ $(call if_changed,objcopy)
	210	+
206	211	LDFLAGS_$(SPL_BIN) += -T u-boot-spl.lds $(LDFLAGS_FINAL)
207	212	ifneq ($(CONFIG_SPL_TEXT_BASE),)
208	213	LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE)
...	...	@@ -228,6 +233,16 @@
228	233
229	234	$(obj)/u-boot-spl.lds: $(LDSCRIPT) FORCE
230	235	$(CPP) $(cpp_flags) $(LDPPFLAGS) -I$(obj). -ansi -D__ASSEMBLY__ -P - < $< > $@
	236	+
	237	+# read all saved command lines
	238	+
	239	+targets := $(wildcard $(sort $(targets)))
	240	+cmd_files := $(wildcard $(obj)/.*.cmd $(foreach f,$(targets),$(dir $(f)).$(notdir $(f)).cmd))
	241	+
	242	+ifneq ($(cmd_files),)
	243	+ $(cmd_files): ; # Do not try to update included dependency files
	244	+ include $(cmd_files)
	245	+endif
231	246
232	247	PHONY += FORCE
233	248	FORCE: