[PATCH v4 5/7] kbuild: Allow adding modules into the FIT ramdisk
From: Simon Glass <sjg@chromium.org>
Date: 2025-10-06 23:02:53
Also in:
linux-kbuild, lkml
Subsystem:
arm64 fit support, arm64 port (aarch64 architecture), kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Simon Glass, Catalin Marinas, Will Deacon, Nathan Chancellor, Nicolas Schier, Linus Torvalds
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 $(obj)/image.fit: $(obj)/Image $(obj)/dts/dtbs-list FORCE $(call if_changed,fit)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 1d581ba5df66..c6a3aa653035 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib@@ -398,11 +398,17 @@ MAKE_FIT := $(srctree)/scripts/make_fit.py # Use this to override the compression algorithm FIT_COMPRESSION ?= gzip +# Set this to 1 to include an initrd with all the kernel modules +FIT_MODULES ?= + quiet_cmd_fit = FIT $@ - cmd_fit = $(MAKE_FIT) -o $@ --arch $(UIMAGE_ARCH) --os linux \ - --name '$(UIMAGE_NAME)' \ + cmd_fit = $(if $(FIT_MODULES), \ + find $(objtree) -name '*.ko' > $(objtree)/.modules-list 2>/dev/null &&) \ + $(MAKE_FIT) -o $@ --arch $(UIMAGE_ARCH) --os linux \ + --name '$(UIMAGE_NAME)' $(MAKE_FIT_FLAGS) \ $(if $(findstring 1,$(KBUILD_VERBOSE)),-v) \ $(if $(FIT_DECOMPOSE_DTBS),--decompose-dtbs) \ + $(if $(FIT_MODULES),--modules @$(objtree)/.modules-list) \ --compress $(FIT_COMPRESSION) -k $< @$(word 2,$^) # XZ
--
2.43.0