Skip to contentSkip to conversation

kbuild: Fix unnecessary rebuilding DT base+overlay targets

PATCH In review Rob Herring (Arm) 2 participants 2 messages Jan 14

Subsystems (2)
Kbuild Device tree
lore
Share & tools
lore

Rob Herring (Arm)

author maintainer
#0 lore raw

PATCH 1/1 kbuild: Fix unnecessary rebuilding DT base+overlay targets

Commit 5d0cac427d42 ("kbuild: Support directory targets for building DTBs") causes base+overlay targets to be rebuilt every time. The problem is due to the added check on $(MAKECMDGOALS) which now testing again doesn't even seem to be needed. Revert that portion of the commit.

Fixes 5d0cac427d42 ("kbuild: Support directory targets for building DTBs")
Reported-by David Heidelberg <[email protected]>
Signed-off-by Rob Herring (Arm) <[email protected]>
---
 scripts/Makefile.dtbs | 3 ---
 1 file changed, 3 deletions(-)
scripts/Makefile.dtbs +0 -3
index f5d51b8c2eeb..b2d85b9a4a7a 100644
@@ -23,10 +23,7 @@ dtb-y           := $(addprefix $(obj)/, $(dtb-y))
 multi-dtb-y     := $(addprefix $(obj)/, $(multi-dtb-y))
 real-dtb-y      := $(addprefix $(obj)/, $(real-dtb-y))
 
-dtb-targets := %.dtb %.dtbo dtbs dtbs_check
-ifneq ($(findstring /dts/,$(MAKECMDGOALS))$(filter $(dtb-targets),$(MAKECMDGOALS)),)
 always-y        += $(dtb-y)
-endif
 
 targets         += $(real-dtb-y)
Signature · 1 line
2.51.0
Tested-by on v1 1/1
#1 lore raw
Quoted 5 lines · Rob Herring (Arm)

Commit 5d0cac427d42 ("kbuild: Support directory targets for building DTBs") causes base+overlay targets to be rebuilt every time. The problem is due to the added check on $(MAKECMDGOALS) which now testing again doesn't even seem to be needed. Revert that portion of the commit.

Quoted 7 lines
Fixes 5d0cac427d42 ("kbuild: Support directory targets for building DTBs")
Reported-by David Heidelberg <[email protected]>
Signed-off-by Rob Herring (Arm) <[email protected]>
---
  scripts/Makefile.dtbs | 3 ---
  1 file changed, 3 deletions(-)

Whoa, that was quick! Thanks.

Tested-by David Heidelberg <[email protected]>