From: Simon Glass <sjg@chromium.org>
To: linux-arm-kernel@lists.infradead.org
Cc: "Nicolas Schier" <nicolas@fjasle.eu>,
"Masahiro Yamada" <masahiroy@kernel.org>,
"Chen-Yu Tsai" <wenst@chromium.org>,
"Tom Rini" <trini@konsulko.com>,
"Ahmad Fatoum" <a.fatoum@pengutronix.de>,
"J . Neuschäfer" <j.ne@posteo.net>,
"Simon Glass" <sjg@chromium.org>,
"Reviewed-by : Nicolas Schier" <nsc@kernel.org>,
"Nathan Chancellor" <nathan@kernel.org>,
"Ard Biesheuvel" <ardb@kernel.org>,
"Catalin Marinas" <catalin.marinas@arm.com>,
"Josh Poimboeuf" <jpoimboe@kernel.org>,
"Kees Cook" <kees@kernel.org>, "Miguel Ojeda" <ojeda@kernel.org>,
"Nicolas Schier" <nicolas.schier@linux.dev>,
"Parth Pancholi" <parth.pancholi@toradex.com>,
"Rong Xu" <xur@google.com>, "Tamir Duberstein" <tamird@gmail.com>,
"Thomas Weißschuh" <thomas.weissschuh@linutronix.de>,
"Will Deacon" <will@kernel.org>,
linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v5 6/8] kbuild: Allow adding modules into the FIT ramdisk
Date: Fri, 14 Nov 2025 07:27:32 -0700 [thread overview]
Message-ID: <20251114142741.1919072-7-sjg@chromium.org> (raw)
In-Reply-To: <20251114142741.1919072-1-sjg@chromium.org>
Support 'make image.fit FIT_MODULES=1' to put all the modules into a
ramdisk image within the FIT.
Add image.fit as a target which requires modules, so that modules will
built automatically when using FIT_MODULES=1
Signed-off-by: Simon Glass <sjg@chromium.org>
Suggested-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Suggested-by: Reviewed-by: Nicolas Schier <nsc@kernel.org>
Acked-by: Nathan Chancellor <nathan@kernel.org>
---
Changes in v5:
- Build modules automatically if needed (fix from Nicolas Schier)
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
Makefile | 1 +
arch/arm64/Makefile | 1 +
scripts/Makefile.lib | 10 ++++++++--
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 8cd46222fc48..4eccaef95826 100644
--- a/Makefile
+++ b/Makefile
@@ -773,6 +773,7 @@ endif
# Just "make" or "make all" shall build modules as well
modules-targets := all
+modules-targets += $(if $(FIT_MODULES),image.fit)
modules-targets += modules
modules-targets += nsdeps
modules-targets += compile_commands.json
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 73a10f65ce8b..7036f251ab40 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/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
next prev parent reply other threads:[~2025-11-14 14:28 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-14 14:27 [PATCH v5 0/8] scripts/make_fit: Support ramdisks and faster operations Simon Glass
2025-11-14 14:27 ` [PATCH v5 1/8] scripts/make_fit: Speed up operation Simon Glass
2025-11-14 14:27 ` [PATCH v5 2/8] scripts/make_fit: Support an initial ramdisk Simon Glass
2025-11-14 14:27 ` [PATCH v5 3/8] scripts/make_fit: Move dtb processing into a function Simon Glass
2025-11-14 14:27 ` [PATCH v5 4/8] scripts/make_fit: Provide a way to add built modules Simon Glass
2025-11-15 14:39 ` Ahmad Fatoum
2025-11-17 18:06 ` Simon Glass
2025-11-14 14:27 ` [PATCH v5 5/8] kbuild: Split out module targets into a variable Simon Glass
2025-11-14 14:27 ` Simon Glass [this message]
2025-11-14 15:29 ` [PATCH v5 6/8] kbuild: Allow adding modules into the FIT ramdisk Thomas Weißschuh
2025-11-14 19:50 ` Nicolas Schier
2025-11-17 8:30 ` Thomas Weißschuh
2025-11-14 14:27 ` [PATCH v5 7/8] scripts/make_fit: Support a few more parallel compressors Simon Glass
2025-11-14 14:27 ` [PATCH v5 8/8] scripts/make_fit: Compress dtbs in parallel Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251114142741.1919072-7-sjg@chromium.org \
--to=sjg@chromium.org \
--cc=a.fatoum@pengutronix.de \
--cc=ardb@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=j.ne@posteo.net \
--cc=jpoimboe@kernel.org \
--cc=kees@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=nathan@kernel.org \
--cc=nicolas.schier@linux.dev \
--cc=nicolas@fjasle.eu \
--cc=nsc@kernel.org \
--cc=ojeda@kernel.org \
--cc=parth.pancholi@toradex.com \
--cc=tamird@gmail.com \
--cc=thomas.weissschuh@linutronix.de \
--cc=trini@konsulko.com \
--cc=wenst@chromium.org \
--cc=will@kernel.org \
--cc=xur@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®