[PATCH 2/2] board: st: factorize STM32MP FWU multi-bank support
Dario Binacchi
dario.binacchi at amarulasolutions.com
Mon May 18 08:54:28 CEST 2026
Factorize FWU multi-bank support code common to STM32MP1 and
STM32MP2 platforms into a dedicated shared source file.
No functional change intended.
Signed-off-by: Dario Binacchi <dario.binacchi at amarulasolutions.com>
---
board/st/common/Makefile | 1 +
board/st/common/stm32mp_fwu.c | 55 +++++++++++++++++++++++++++++++++++
board/st/stm32mp1/stm32mp1.c | 54 ----------------------------------
board/st/stm32mp2/stm32mp2.c | 53 ---------------------------------
4 files changed, 56 insertions(+), 107 deletions(-)
create mode 100644 board/st/common/stm32mp_fwu.c
diff --git a/board/st/common/Makefile b/board/st/common/Makefile
index 122b13c3aa8d..36dfaddfa0eb 100644
--- a/board/st/common/Makefile
+++ b/board/st/common/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_PMIC_STPMIC1) += stpmic1.o
ifeq ($(CONFIG_ARCH_STM32MP),y)
obj-$(CONFIG_SET_DFU_ALT_INFO) += stm32mp_dfu.o
obj-$(CONFIG_$(PHASE_)DFU_VIRT) += stm32mp_dfu_virt.o
+obj-$(CONFIG_FWU_MULTI_BANK_UPDATE) += stm32mp_fwu.o
endif
obj-$(CONFIG_TYPEC_STUSB160X) += stusb160x.o
diff --git a/board/st/common/stm32mp_fwu.c b/board/st/common/stm32mp_fwu.c
new file mode 100644
index 000000000000..ac7ca6bdca2a
--- /dev/null
+++ b/board/st/common/stm32mp_fwu.c
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
+/*
+ * Copyright (C) 2026 Amarula Solutions, Dario Binacchi <dario.binacchi at amarulasolutions.com>
+ */
+
+#include <fwu.h>
+#include <part_efi.h>
+#include <asm/io.h>
+/**
+ * fwu_plat_get_bootidx() - Get the value of the boot index
+ * @boot_idx: Boot index value
+ *
+ * Get the value of the bank(partition) from which the platform
+ * has booted. This value is passed to U-Boot from the earlier
+ * stage bootloader which loads and boots all the relevant
+ * firmware images
+ *
+ */
+void fwu_plat_get_bootidx(uint *boot_idx)
+{
+ *boot_idx = (readl(TAMP_FWU_BOOT_INFO_REG) >>
+ TAMP_FWU_BOOT_IDX_OFFSET) & TAMP_FWU_BOOT_IDX_MASK;
+}
+
+int fwu_platform_hook(struct udevice *dev, struct fwu_data *data)
+{
+ uint boot_idx;
+ efi_guid_t boot_uuid, root_uuid;
+ const efi_guid_t boot_type_guid = PARTITION_XBOOTLDR;
+ const efi_guid_t root_type_guid =
+ PARTITION_LINUX_FILE_SYSTEM_DATA_GUID;
+ char uuidbuf[UUID_STR_LEN + 1];
+ int retb, retr;
+
+ fwu_plat_get_bootidx(&boot_idx);
+
+ retb = fwu_mdata_get_image_guid(&boot_uuid, &boot_type_guid, boot_idx);
+ retr = fwu_mdata_get_image_guid(&root_uuid, &root_type_guid, boot_idx);
+
+ if (!retb && !retr) {
+ uuid_bin_to_str(boot_uuid.b, uuidbuf, UUID_STR_FORMAT_GUID);
+ env_set("boot_partuuid", uuidbuf);
+
+ uuid_bin_to_str(root_uuid.b, uuidbuf, UUID_STR_FORMAT_GUID);
+ env_set("root_partuuid", uuidbuf);
+ } else if (!retb && retr) {
+ log_warning("%s: found boot GUID but missing root GUID (%d)\n",
+ __func__, retr);
+ } else if (!retr && retb) {
+ log_warning("%s: found root GUID but missing boot GUID (%d)\n",
+ __func__, retb);
+ }
+
+ return 0;
+}
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 8164a62e9a3a..9b933a2ba0b6 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -837,57 +837,3 @@ static void board_copro_image_process(ulong fw_image, size_t fw_size)
}
U_BOOT_FIT_LOADABLE_HANDLER(IH_TYPE_COPRO, board_copro_image_process);
-
-#if defined(CONFIG_FWU_MULTI_BANK_UPDATE)
-
-#include <fwu.h>
-
-/**
- * fwu_plat_get_bootidx() - Get the value of the boot index
- * @boot_idx: Boot index value
- *
- * Get the value of the bank(partition) from which the platform
- * has booted. This value is passed to U-Boot from the earlier
- * stage bootloader which loads and boots all the relevant
- * firmware images
- *
- */
-void fwu_plat_get_bootidx(uint *boot_idx)
-{
- *boot_idx = (readl(TAMP_FWU_BOOT_INFO_REG) >>
- TAMP_FWU_BOOT_IDX_OFFSET) & TAMP_FWU_BOOT_IDX_MASK;
-}
-
-int fwu_platform_hook(struct udevice *dev, struct fwu_data *data)
-{
- uint boot_idx;
- efi_guid_t boot_uuid, root_uuid;
- const efi_guid_t boot_type_guid = PARTITION_XBOOTLDR;
- const efi_guid_t root_type_guid =
- PARTITION_LINUX_FILE_SYSTEM_DATA_GUID;
- char uuidbuf[UUID_STR_LEN + 1];
- int retb, retr;
-
- fwu_plat_get_bootidx(&boot_idx);
-
- retb = fwu_mdata_get_image_guid(&boot_uuid, &boot_type_guid, boot_idx);
- retr = fwu_mdata_get_image_guid(&root_uuid, &root_type_guid, boot_idx);
-
- if (!retb && !retr) {
- uuid_bin_to_str(boot_uuid.b, uuidbuf, UUID_STR_FORMAT_GUID);
- env_set("boot_partuuid", uuidbuf);
-
- uuid_bin_to_str(root_uuid.b, uuidbuf, UUID_STR_FORMAT_GUID);
- env_set("root_partuuid", uuidbuf);
- } else if (!retb && retr) {
- log_warning("%s: found boot GUID but missing root GUID (%d)\n",
- __func__, retr);
- } else if (!retr && retb) {
- log_warning("%s: found root GUID but missing boot GUID (%d)\n",
- __func__, retb);
- }
-
- return 0;
-}
-#endif /* CONFIG_FWU_MULTI_BANK_UPDATE */
-
diff --git a/board/st/stm32mp2/stm32mp2.c b/board/st/stm32mp2/stm32mp2.c
index 5cbbbc322a3a..7bc7d2a608fd 100644
--- a/board/st/stm32mp2/stm32mp2.c
+++ b/board/st/stm32mp2/stm32mp2.c
@@ -188,56 +188,3 @@ void board_quiesce_devices(void)
{
led_boot_off();
}
-
-#if defined(CONFIG_FWU_MULTI_BANK_UPDATE)
-
-#include <fwu.h>
-
-/**
- * fwu_plat_get_bootidx() - Get the value of the boot index
- * @boot_idx: Boot index value
- *
- * Get the value of the bank(partition) from which the platform
- * has booted. This value is passed to U-Boot from the earlier
- * stage bootloader which loads and boots all the relevant
- * firmware images
- *
- */
-void fwu_plat_get_bootidx(uint *boot_idx)
-{
- *boot_idx = (readl(TAMP_FWU_BOOT_INFO_REG) >>
- TAMP_FWU_BOOT_IDX_OFFSET) & TAMP_FWU_BOOT_IDX_MASK;
-}
-
-int fwu_platform_hook(struct udevice *dev, struct fwu_data *data)
-{
- uint boot_idx;
- efi_guid_t boot_uuid, root_uuid;
- const efi_guid_t boot_type_guid = PARTITION_XBOOTLDR;
- const efi_guid_t root_type_guid =
- PARTITION_LINUX_FILE_SYSTEM_DATA_GUID;
- char uuidbuf[UUID_STR_LEN + 1];
- int retb, retr;
-
- fwu_plat_get_bootidx(&boot_idx);
-
- retb = fwu_mdata_get_image_guid(&boot_uuid, &boot_type_guid, boot_idx);
- retr = fwu_mdata_get_image_guid(&root_uuid, &root_type_guid, boot_idx);
-
- if (!retb && !retr) {
- uuid_bin_to_str(boot_uuid.b, uuidbuf, UUID_STR_FORMAT_GUID);
- env_set("boot_partuuid", uuidbuf);
-
- uuid_bin_to_str(root_uuid.b, uuidbuf, UUID_STR_FORMAT_GUID);
- env_set("root_partuuid", uuidbuf);
- } else if (!retb && retr) {
- log_warning("%s: found boot GUID but missing root GUID (%d)\n",
- __func__, retr);
- } else if (!retr && retb) {
- log_warning("%s: found root GUID but missing boot GUID (%d)\n",
- __func__, retb);
- }
-
- return 0;
-}
-#endif /* CONFIG_FWU_MULTI_BANK_UPDATE */
--
2.43.0
base-commit: 215496fec59b3fa09256b4fb62f92af46e2ec7f9
branch: fwumdata-ab-stm32mp1
More information about the U-Boot
mailing list