tools: Reorganize mkfwumdata tool into fwumdata_src directory

Update FWU metadata-related tools by moving mkfwumdata.c into a new
tools/fwumdata_src/ directory structure. This refactoring prepares for the
addition of the fwumdata runtime tool, which will allow editing FWU
metadata directly from the target.

The Kconfig and Makefile entries are also moved into separate files within
the new directory (Kconfig and fwumdata.mk respectively) to keep all FWU
metadata tool configurations together and improve maintainability.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
Tested-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 061717c8fe53d4465f6992123c09f73e1b99ea9b..a925247b0cb305349ec12c0aee9fe680fc55f69c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1246,9 +1246,10 @@ FWU Multi Bank Update
 M:     Sughosh Ganu <sughosh.ganu@arm.com>
 S:     Maintained
 T:     git https://source.denx.de/u-boot/custodians/u-boot-efi.git
+F:     doc/mkfwumdata.1
 F:     lib/fwu_updates/*
 F:     drivers/fwu-mdata/*
-F:     tools/mkfwumdata.c
+F:     tools/fwumdata_src/mkfwumdata.c
 
 GATEWORKS_SC
 M:     Tim Harvey <tharvey@gateworks.com>

diff --git a/tools/Kconfig b/tools/Kconfig
index a1b4d701ac78f9c574a47f08a76476ba3e065a77..ef33295b8ecd8afa217a59cf7fe6d25946b091ce 100644 (file)
--- a/tools/Kconfig
+++ b/tools/Kconfig
@@ -194,13 +194,6 @@ config LUT_SEQUENCE
        help
          Look Up Table Sequence
 
-config TOOLS_MKFWUMDATA
-       bool "Build mkfwumdata command"
-       default y if FWU_MULTI_BANK_UPDATE
-       help
-         This command allows users to create a raw image of the FWU
-         metadata for initial installation of the FWU multi bank
-         update on the board. The installation method depends on
-         the platform.
+source tools/fwumdata_src/Kconfig
 
 endmenu

diff --git a/tools/Makefile b/tools/Makefile
index 0ac683ac3ec7d25f8ace09fdc11f647a07d82871..1908a63b42ca3e88511a01b133174b62ab9e031d 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -272,9 +272,7 @@ mkeficapsule-objs := generated/lib/uuid.o \
        mkeficapsule.o
 hostprogs-always-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule
 
-mkfwumdata-objs := mkfwumdata.o generated/lib/crc32.o
-HOSTLDLIBS_mkfwumdata += -luuid
-hostprogs-always-$(CONFIG_TOOLS_MKFWUMDATA) += mkfwumdata
+include tools/fwumdata_src/fwumdata.mk
 
 # We build some files with extra pedantic flags to try to minimize things
 # that won't build on some weird host compiler -- though there are lots of

diff --git a/tools/fwumdata_src/Kconfig b/tools/fwumdata_src/Kconfig
new file mode 100644 (file)
index 0000000..c033c56
--- /dev/null
+++ b/tools/fwumdata_src/Kconfig
@@ -0,0 +1,8 @@
+config TOOLS_MKFWUMDATA
+       bool "Build mkfwumdata command"
+       default y if FWU_MULTI_BANK_UPDATE
+       help
+         This command allows users to create a raw image of the FWU
+         metadata for initial installation of the FWU multi bank
+         update on the board. The installation method depends on
+         the platform.

diff --git a/tools/fwumdata_src/fwumdata.mk b/tools/fwumdata_src/fwumdata.mk
new file mode 100644 (file)
index 0000000..00f4ae5
--- /dev/null
+++ b/tools/fwumdata_src/fwumdata.mk
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# (C) Copyright 2025, Kory Maincent <kory.maincent@bootlin.com>
+
+mkfwumdata-objs := fwumdata_src/mkfwumdata.o generated/lib/crc32.o
+HOSTLDLIBS_mkfwumdata += -luuid
+hostprogs-always-$(CONFIG_TOOLS_MKFWUMDATA) += mkfwumdata

diff --git a/tools/mkfwumdata.c b/tools/fwumdata_src/mkfwumdata.c
similarity index 100%
rename from tools/mkfwumdata.c
rename to tools/fwumdata_src/mkfwumdata.c