From 09297182ad79a4ea30fd6aa74d33646efc4eb12f Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 13 Apr 2026 07:15:38 -0600 Subject: kbuild: Use if_changed for font and splash .incbin rules The generated .S files for fonts and splash screens use .incbin with the full prerequisite path. When building with O= this bakes an absolute path into the .S file. If the build directory is later used on a different machine (e.g. in a container), the assembler cannot find the source file. Follow the existing DTB convention: rename the object targets to use compound suffixes (.ttf.o, .bmp.o), switch the pattern rules from direct $(call cmd,...) to FORCE + $(call if_changed,...), and register the new suffixes with intermediate_targets so that kbuild loads their .cmd files. This lets if_changed detect when the recorded command (including source paths) has changed and regenerate the .S file automatically. The EFI rule is left unchanged since its prerequisite is a generated file in the build directory, like the DTB and DTBO rules. The intermediate_targets entries stay in scripts/Makefile.build rather than moving to scripts/Makefile.lib-u-boot, because that file is included before intermediate_targets is defined and 'targets' is ':=', so a '$(call intermediate_targets, ...)' inside it would expand to empty and silently drop the entries. To keep the upstream block untouched, the U-Boot additions go in a separate 'targets +=' block immediately below. Suggested-by: Rasmus Villemoes Signed-off-by: Simon Glass Reviewed-by: Rasmus Villemoes --- scripts/Makefile.lib-u-boot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/Makefile.lib-u-boot') diff --git a/scripts/Makefile.lib-u-boot b/scripts/Makefile.lib-u-boot index c55f8d8e0c3..4d60a8eee49 100644 --- a/scripts/Makefile.lib-u-boot +++ b/scripts/Makefile.lib-u-boot @@ -20,8 +20,8 @@ cmd_S_ttf= \ echo '.balign 16'; \ ) > $@ -$(obj)/%.S: $(src)/%.ttf - $(call cmd,S_ttf) +$(obj)/%.ttf.S: $(src)/%.ttf FORCE + $(call if_changed,S_ttf) # Splash logos # --------------------------------------------------------------------------- @@ -40,8 +40,8 @@ cmd_S_splash= \ echo '.balign 16'; \ ) > $@ -$(obj)/%.S: $(src)/%.bmp - $(call cmd,S_splash) +$(obj)/%.bmp.S: $(src)/%.bmp FORCE + $(call if_changed,S_splash) # EFI applications # A Makefile target *.efi is built as EFI application. -- cgit v1.2.3