Re: [PATCH v4 5/7] kbuild: Allow adding modules into the FIT ramdisk

[Nicolas Schier <nsc@kernel.org>]

On Mon, Oct 06, 2025 at 05:01:56PM -0600, Simon Glass wrote:
> Support 'make image.fit FIT_MODULES=1' to put all the modules into a
> ramdisk image within the FIT.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Suggested-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> Acked-by: Nathan Chancellor <nathan@kernel.org>
> ---
> 
> Changes in v4:
> - Rename the Makefile variable from 'EXTRA' to 'MAKE_FIT_FLAGS'
> - Use an empty FIT_MODULES to disable the feature, instead of '0'
> - Make use of the 'modules' dependency to ensure modules are built
> - Pass the list of modules to the script
> 
>  arch/arm64/boot/Makefile |  4 ++++
>  scripts/Makefile.lib     | 10 ++++++++--
>  2 files changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile
> index b5a08333bc57..d10c85f96aea 100644
> --- a/arch/arm64/boot/Makefile
> +++ b/arch/arm64/boot/Makefile
> @@ -43,6 +43,10 @@ $(obj)/Image.zst: $(obj)/Image FORCE
>  $(obj)/Image.xz: $(obj)/Image FORCE
>  	$(call if_changed,xzkern)
>  
> +ifeq ($(FIT_MODULES),1)
> +.PHONY: modules
> +$(obj)/image.fit: modules
> +endif

This does not work for me.  I tried:

    make clean
    make image.fit FIT_MODULES=1

but modules are not built as KBUILD_MODULES is not set in top-level
Makefile.  Works for me with the following diff:


diff --git a/Makefile b/Makefile
index d14824792227..e6b8bcbdb073 100644
--- a/Makefile
+++ b/Makefile
@@ -772,7 +772,13 @@ endif
 # in addition to whatever we do anyway.
 # Just "make" or "make all" shall build modules as well
 
-ifneq ($(filter all modules nsdeps compile_commands.json clang-%,$(MAKECMDGOALS)),)
+modules-targets := all
+modules-targets += $(if $(FIT_MODULES), image.fit)
+modules-targets += modules
+modules-targets += nsdeps
+modules-targets += compile_commands.json
+modules-targets += clang-%
+ifneq ($(filter $(modules-targets),$(MAKECMDGOALS)),)
   KBUILD_MODULES := y
 endif
 
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 73a10f65ce8b..f7f0c144908a 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -174,6 +174,7 @@ endif
 all:	$(notdir $(KBUILD_IMAGE))
 
 image.fit: dtbs
+image.fit: $(if $(FIT_MODULES), modules)
 
 vmlinuz.efi image.fit: Image
 $(BOOT_TARGETS): vmlinux
diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile
index d10c85f96aea..b5a08333bc57 100644
--- a/arch/arm64/boot/Makefile
+++ b/arch/arm64/boot/Makefile
@@ -43,10 +43,6 @@ $(obj)/Image.zst: $(obj)/Image FORCE
 $(obj)/Image.xz: $(obj)/Image FORCE
 	$(call if_changed,xzkern)
 
-ifeq ($(FIT_MODULES),1)
-.PHONY: modules
-$(obj)/image.fit: modules
-endif
 $(obj)/image.fit: $(obj)/Image $(obj)/dts/dtbs-list FORCE
 	$(call if_changed,fit)
 


Kind regards
Nicolas