[PATCH] fwu-mdata: Allow multiple metadata storage drivers to be enabled

[PATCH] fwu-mdata: Allow multiple metadata storage drivers to be enabled

[Kory Maincent]

Change the Kconfig from a "choice" to a conditional block, allowing
multiple FWU metadata storage drivers to be selected simultaneously
instead of being mutually exclusive.

This enables systems with FWU metadata on different storage types
(e.g., both GPT-partitioned block devices and MTD devices) to have
both drivers compiled in. The board can then select the appropriate
driver at runtime based on the devicetree description.

The change converts FWU_MDATA to a menuconfig and replaces the
"choice/endchoice" block with "if FWU_MDATA/endif", making
FWU_MDATA_GPT_BLK default to 'y' for backward compatibility.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
 drivers/fwu-mdata/Kconfig | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/fwu-mdata/Kconfig b/drivers/fwu-mdata/Kconfig
index 42736a5e43b..59571ac01ea 100644
--- a/drivers/fwu-mdata/Kconfig
+++ b/drivers/fwu-mdata/Kconfig
@@ -1,4 +1,4 @@
-config FWU_MDATA
+menuconfig FWU_MDATA
 	bool "Driver support for accessing FWU Metadata"
 	depends on DM
 	help
@@ -6,16 +6,14 @@ config FWU_MDATA
 	  FWU Metadata partitions reside on the same storage device
 	  which contains the other FWU updatable firmware images.
 
-choice
-	prompt "Storage Layout Scheme"
-	depends on FWU_MDATA
-	default FWU_MDATA_GPT_BLK
+if FWU_MDATA
 
 config FWU_MDATA_GPT_BLK
 	bool "FWU Metadata access for GPT partitioned Block devices"
 	select PARTITION_TYPE_GUID
 	select PARTITION_UUIDS
-	depends on FWU_MDATA && BLK && EFI_PARTITION
+	depends on BLK && EFI_PARTITION
+	default y
 	help
 	  Enable support for accessing FWU Metadata on GPT partitioned
 	  block devices.
@@ -28,4 +26,4 @@ config FWU_MDATA_MTD
 	  (or non-GPT partitioned, e.g. partition nodes in devicetree)
 	  MTD devices.
 
-endchoice
+endif
-- 
2.43.0

Re: [PATCH] fwu-mdata: Allow multiple metadata storage drivers to be enabled

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 838 bytes --]

On Wed, Jan 14, 2026 at 10:56:53AM +0100, Kory Maincent wrote:

> Change the Kconfig from a "choice" to a conditional block, allowing
> multiple FWU metadata storage drivers to be selected simultaneously
> instead of being mutually exclusive.
> 
> This enables systems with FWU metadata on different storage types
> (e.g., both GPT-partitioned block devices and MTD devices) to have
> both drivers compiled in. The board can then select the appropriate
> driver at runtime based on the devicetree description.
> 
> The change converts FWU_MDATA to a menuconfig and replaces the
> "choice/endchoice" block with "if FWU_MDATA/endif", making
> FWU_MDATA_GPT_BLK default to 'y' for backward compatibility.
> 
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>

Reviewed-by: Tom Rini <trini@konsulko.com>

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH] fwu-mdata: Allow multiple metadata storage drivers to be enabled

[Kory Maincent]

On Wed, 14 Jan 2026 08:49:18 -0600
Tom Rini <trini@konsulko.com> wrote:

> On Wed, Jan 14, 2026 at 10:56:53AM +0100, Kory Maincent wrote:
> 
> > Change the Kconfig from a "choice" to a conditional block, allowing
> > multiple FWU metadata storage drivers to be selected simultaneously
> > instead of being mutually exclusive.
> > 
> > This enables systems with FWU metadata on different storage types
> > (e.g., both GPT-partitioned block devices and MTD devices) to have
> > both drivers compiled in. The board can then select the appropriate
> > driver at runtime based on the devicetree description.
> > 
> > The change converts FWU_MDATA to a menuconfig and replaces the
> > "choice/endchoice" block with "if FWU_MDATA/endif", making
> > FWU_MDATA_GPT_BLK default to 'y' for backward compatibility.
> > 
> > Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>  
> 
> Reviewed-by: Tom Rini <trini@konsulko.com>

Hello,

Any news on this patch? Does something prevent it to be merged?

Regards,
-- 
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com

Re: [PATCH] fwu-mdata: Allow multiple metadata storage drivers to be enabled

[Ilias Apalodimas]

Hi Kory

On Fri, 6 Feb 2026 at 16:19, Kory Maincent <kory.maincent@bootlin.com> wrote:
>
> On Wed, 14 Jan 2026 08:49:18 -0600
> Tom Rini <trini@konsulko.com> wrote:
>
> > On Wed, Jan 14, 2026 at 10:56:53AM +0100, Kory Maincent wrote:
> >
> > > Change the Kconfig from a "choice" to a conditional block, allowing
> > > multiple FWU metadata storage drivers to be selected simultaneously
> > > instead of being mutually exclusive.
> > >
> > > This enables systems with FWU metadata on different storage types
> > > (e.g., both GPT-partitioned block devices and MTD devices) to have
> > > both drivers compiled in. The board can then select the appropriate
> > > driver at runtime based on the devicetree description.
> > >
> > > The change converts FWU_MDATA to a menuconfig and replaces the
> > > "choice/endchoice" block with "if FWU_MDATA/endif", making
> > > FWU_MDATA_GPT_BLK default to 'y' for backward compatibility.
> > >
> > > Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> >
> > Reviewed-by: Tom Rini <trini@konsulko.com>
>
> Hello,
>
> Any news on this patch? Does something prevent it to be merged?

I cc'ed Sughosh which maintains fwu. I can send a PR if we get an ACK

Thanks
/Ilias
>
> Regards,
> --
> Köry Maincent, Bootlin
> Embedded Linux and kernel engineering
> https://bootlin.com

Re: [PATCH] fwu-mdata: Allow multiple metadata storage drivers to be enabled

[Sughosh Ganu]

On Wed, Feb 11, 2026 at 11:04:17AM +0200, Ilias Apalodimas wrote:
> Hi Kory
> 
> On Fri, 6 Feb 2026 at 16:19, Kory Maincent <kory.maincent@bootlin.com> wrote:
> >
> > On Wed, 14 Jan 2026 08:49:18 -0600
> > Tom Rini <trini@konsulko.com> wrote:
> >
> > > On Wed, Jan 14, 2026 at 10:56:53AM +0100, Kory Maincent wrote:
> > >
> > > > Change the Kconfig from a "choice" to a conditional block, allowing
> > > > multiple FWU metadata storage drivers to be selected simultaneously
> > > > instead of being mutually exclusive.
> > > >
> > > > This enables systems with FWU metadata on different storage types
> > > > (e.g., both GPT-partitioned block devices and MTD devices) to have
> > > > both drivers compiled in. The board can then select the appropriate
> > > > driver at runtime based on the devicetree description.
> > > >
> > > > The change converts FWU_MDATA to a menuconfig and replaces the
> > > > "choice/endchoice" block with "if FWU_MDATA/endif", making
> > > > FWU_MDATA_GPT_BLK default to 'y' for backward compatibility.
> > > >
> > > > Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> > >
> > > Reviewed-by: Tom Rini <trini@konsulko.com>
> >
> > Hello,
> >
> > Any news on this patch? Does something prevent it to be merged?
> 
> I cc'ed Sughosh which maintains fwu. I can send a PR if we get an ACK

Apologies for the delay. I will get back on this by tomorrow. Thanks.

-sughosh

> 
> Thanks
> /Ilias
> >
> > Regards,
> > --
> > Köry Maincent, Bootlin
> > Embedded Linux and kernel engineering
> > https://bootlin.com

Re: [PATCH] fwu-mdata: Allow multiple metadata storage drivers to be enabled

[Ilias Apalodimas]

On Wed, 11 Feb 2026 at 12:12, Sughosh Ganu <sughosh.ganu@arm.com> wrote:
>
> On Wed, Feb 11, 2026 at 11:04:17AM +0200, Ilias Apalodimas wrote:
> > Hi Kory
> >
> > On Fri, 6 Feb 2026 at 16:19, Kory Maincent <kory.maincent@bootlin.com> wrote:
> > >
> > > On Wed, 14 Jan 2026 08:49:18 -0600
> > > Tom Rini <trini@konsulko.com> wrote:
> > >
> > > > On Wed, Jan 14, 2026 at 10:56:53AM +0100, Kory Maincent wrote:
> > > >
> > > > > Change the Kconfig from a "choice" to a conditional block, allowing
> > > > > multiple FWU metadata storage drivers to be selected simultaneously
> > > > > instead of being mutually exclusive.
> > > > >
> > > > > This enables systems with FWU metadata on different storage types
> > > > > (e.g., both GPT-partitioned block devices and MTD devices) to have
> > > > > both drivers compiled in. The board can then select the appropriate
> > > > > driver at runtime based on the devicetree description.
> > > > >
> > > > > The change converts FWU_MDATA to a menuconfig and replaces the
> > > > > "choice/endchoice" block with "if FWU_MDATA/endif", making
> > > > > FWU_MDATA_GPT_BLK default to 'y' for backward compatibility.
> > > > >
> > > > > Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> > > >
> > > > Reviewed-by: Tom Rini <trini@konsulko.com>
> > >
> > > Hello,
> > >
> > > Any news on this patch? Does something prevent it to be merged?
> >
> > I cc'ed Sughosh which maintains fwu. I can send a PR if we get an ACK
>
> Apologies for the delay. I will get back on this by tomorrow. Thanks.

Thanks Sughosh. If you are limited on time you can ignore
https://lore.kernel.org/u-boot/20260206152027.1c371812@kmaincent-XPS-13-7390/
I've already reviewed it and I'll send a PR to Tom shortly.

Cheers
/Ilias
>
> -sughosh
>
> >
> > Thanks
> > /Ilias
> > >
> > > Regards,
> > > --
> > > Köry Maincent, Bootlin
> > > Embedded Linux and kernel engineering
> > > https://bootlin.com

Re: [PATCH] fwu-mdata: Allow multiple metadata storage drivers to be enabled

[Sughosh Ganu]

On Wed, Jan 14, 2026 at 10:56:53AM +0100, Kory Maincent wrote:
> Change the Kconfig from a "choice" to a conditional block, allowing
> multiple FWU metadata storage drivers to be selected simultaneously
> instead of being mutually exclusive.
> 
> This enables systems with FWU metadata on different storage types
> (e.g., both GPT-partitioned block devices and MTD devices) to have
> both drivers compiled in. The board can then select the appropriate
> driver at runtime based on the devicetree description.
> 
> The change converts FWU_MDATA to a menuconfig and replaces the
> "choice/endchoice" block with "if FWU_MDATA/endif", making
> FWU_MDATA_GPT_BLK default to 'y' for backward compatibility.
> 
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> ---

Acked-by: Sughosh Ganu <sughosh.ganu@arm.com>

-sughosh

>  drivers/fwu-mdata/Kconfig | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/fwu-mdata/Kconfig b/drivers/fwu-mdata/Kconfig
> index 42736a5e43b..59571ac01ea 100644
> --- a/drivers/fwu-mdata/Kconfig
> +++ b/drivers/fwu-mdata/Kconfig
> @@ -1,4 +1,4 @@
> -config FWU_MDATA
> +menuconfig FWU_MDATA
>  	bool "Driver support for accessing FWU Metadata"
>  	depends on DM
>  	help
> @@ -6,16 +6,14 @@ config FWU_MDATA
>  	  FWU Metadata partitions reside on the same storage device
>  	  which contains the other FWU updatable firmware images.
>  
> -choice
> -	prompt "Storage Layout Scheme"
> -	depends on FWU_MDATA
> -	default FWU_MDATA_GPT_BLK
> +if FWU_MDATA
>  
>  config FWU_MDATA_GPT_BLK
>  	bool "FWU Metadata access for GPT partitioned Block devices"
>  	select PARTITION_TYPE_GUID
>  	select PARTITION_UUIDS
> -	depends on FWU_MDATA && BLK && EFI_PARTITION
> +	depends on BLK && EFI_PARTITION
> +	default y
>  	help
>  	  Enable support for accessing FWU Metadata on GPT partitioned
>  	  block devices.
> @@ -28,4 +26,4 @@ config FWU_MDATA_MTD
>  	  (or non-GPT partitioned, e.g. partition nodes in devicetree)
>  	  MTD devices.
>  
> -endchoice
> +endif
> -- 
> 2.43.0
>