diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2020-04-30 14:13:56 +0900 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-05-04 09:00:34 +0200 |
| commit | cee30ead46381f935ae426300d03c1e47f72757e (patch) | |
| tree | a0b94a28449c6421409843d66ffed29afaf089ba /Makefile | |
| parent | 0cfd8c0ca0768e36eaebe95910bbcb5ab765a22b (diff) | |
| download | barebox-cee30ead46381f935ae426300d03c1e47f72757e.tar.gz barebox-cee30ead46381f935ae426300d03c1e47f72757e.tar.xz | |
kbuild: sync if_changed and friends with Linux 5.7-rc2
Resync cmd, if_change, if_changed_dep, and if_changed_rule.
Clean up the users of if_changed_rule.
I deleted the modversions rule. It is dead code because barebox
does not define CONFIG_MODVERSIONS. It does not work without
scripts/genksyms/ anyway.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 3 insertions, 11 deletions
@@ -626,24 +626,18 @@ quiet_cmd_barebox_version = GEN .version $(MAKE) $(build)=common # Generate System.map -quiet_cmd_sysmap = SYSMAP - cmd_sysmap = $(CONFIG_SHELL) $(srctree)/scripts/mksysmap +quiet_cmd_sysmap = SYSMAP System.map + cmd_sysmap = $(CONFIG_SHELL) $(srctree)/scripts/mksysmap $@ System.map # Link of barebox # If CONFIG_KALLSYMS is set .version is already updated # Generate System.map and verify that the content is consistent # Use + in front of the barebox_version rule to silent warning with make -j2 -# First command is ':' to allow us to use + in front of the rule define rule_barebox__ - : $(if $(CONFIG_KALLSYMS),,+$(call cmd,barebox_version)) $(call cmd,barebox__) - $(Q)echo 'cmd_$@ := $(cmd_barebox__)' > $(@D)/.$(@F).cmd - - $(Q)$(if $($(quiet)cmd_sysmap), \ - echo ' $($(quiet)cmd_sysmap) System.map' &&) \ - $(cmd_sysmap) $@ System.map + $(call cmd,sysmap) endef ifdef CONFIG_KALLSYMS @@ -684,10 +678,8 @@ endef # Update barebox version before link # Use + in front of this rule to silent warning about make -j1 -# First command is ':' to allow us to use + in front of this rule cmd_ksym_ld = $(cmd_barebox__) define rule_ksym_ld - : +$(call cmd,barebox_version) $(call cmd,barebox__) $(Q)echo 'cmd_$@ := $(cmd_barebox__)' > $(@D)/.$(@F).cmd |