[DistroKit] [PATCH] v7a: barebox: version bump 2025.05.0 -> 2025.06.0

[DistroKit] [PATCH] v7a: barebox: version bump 2025.05.0 -> 2025.06.0

[Roland Hieber]

Barebox commit 9c3afd5083a3 (included in v2025.06.0) fixes an error
message with the OMAP RNG on Beaglebone:

  ERROR: omap_rng 48310000.rng@0.of: initialization failed.
  ERROR: omap_rng 48310000.rng@0.of: initialization failed.
  ERROR: omap_rng 48310000.rng@0.of: probe failed: Device or resource busy

Bump the version number, run oldconfig with defaults, and update the
remaining platform-specific bareboxes as well.

Link: https://git.pengutronix.de/cgit/barebox/commit/?id=9c3afd5083a3
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 configs/platform-v7a/barebox-am335x-mlo.config | 2 +-
 configs/platform-v7a/barebox-at91.config       | 2 +-
 configs/platform-v7a/barebox-at91.config.diff  | 4 ++--
 configs/platform-v7a/barebox-common.config     | 4 ++--
 configs/platform-v7a/barebox.config            | 4 ++--
 configs/platform-v7a/platformconfig            | 8 ++++----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config
index 44dbadc08599..7e71c0ba5838 100644
--- a/configs/platform-v7a/barebox-am335x-mlo.config
+++ b/configs/platform-v7a/barebox-am335x-mlo.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2025.05.0 Configuration
+# Barebox/arm 2025.06.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARCH_LINUX_NAME="arm"
diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config
index 551357b674fd..eccb44d9517c 100644
--- a/configs/platform-v7a/barebox-at91.config
+++ b/configs/platform-v7a/barebox-at91.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2025.05.0 Configuration
+# Barebox/arm 2025.06.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARCH_LINUX_NAME="arm"
diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
index 31d2f1c3c7c0..162ed9f4791e 100644
--- a/configs/platform-v7a/barebox-at91.config.diff
+++ b/configs/platform-v7a/barebox-at91.config.diff
@@ -1,4 +1,4 @@
-3118a4e72c6ae44b00e041e7fbe80ad3
+0cb3165d3c2844da9a6d01e5407289ca
 CONFIG_ARCH_AT91=y
 # CONFIG_ARCH_BCM283X is not set
 # CONFIG_ARCH_IMX is undefined
@@ -162,7 +162,7 @@ CONFIG_USB_GADGET_DUALSPEED=y
 # CONFIG_USB_HOST is not set
 # CONFIG_USB_HUB_USB251XB is undefined
 # CONFIG_USB_NET_AX88179_178A is undefined
-# CONFIG_USB_ONBOARD_HUB is undefined
+# CONFIG_USB_ONBOARD_DEV is undefined
 # CONFIG_USB_STORAGE is undefined
 # CONFIG_USB_ULPI is undefined
 # CONFIG_USB_XHCI is undefined
diff --git a/configs/platform-v7a/barebox-common.config b/configs/platform-v7a/barebox-common.config
index 51a2c8c8d37c..29a0dfbc2d98 100644
--- a/configs/platform-v7a/barebox-common.config
+++ b/configs/platform-v7a/barebox-common.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2025.05.0 Configuration
+# Barebox/arm 2025.06.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARCH_LINUX_NAME="arm"
@@ -674,7 +674,7 @@ CONFIG_USB_STORAGE=y
 # USB Miscellaneous drivers
 #
 # CONFIG_USB_HUB_USB251XB is not set
-# CONFIG_USB_ONBOARD_HUB is not set
+# CONFIG_USB_ONBOARD_DEV is not set
 # CONFIG_TYPEC_TUSB320 is not set
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_AUTOSTART=y
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index 905311f98bbe..5420a6de68d2 100644
--- a/configs/platform-v7a/barebox.config
+++ b/configs/platform-v7a/barebox.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2025.05.0 Configuration
+# Barebox/arm 2025.06.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARCH_LINUX_NAME="arm"
@@ -920,7 +920,7 @@ CONFIG_USB_STORAGE=y
 # USB Miscellaneous drivers
 #
 # CONFIG_USB_HUB_USB251XB is not set
-# CONFIG_USB_ONBOARD_HUB is not set
+# CONFIG_USB_ONBOARD_DEV is not set
 # CONFIG_TYPEC_TUSB320 is not set
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DUALSPEED=y
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 914e16c38ae0..6517192acca6 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -185,18 +185,18 @@ PTXCONF_AT91BOOTSTRAP2_MD5="ef321a80bf428bfd6cb642c96126ef6c"
 PTXCONF_AT91BOOTSTRAP2_CONFIG="at91bootstrap-wifx-l1.config"
 PTXCONF_BAREBOX_COMMON_ARCH_STRING="arm"
 PTXCONF_BAREBOX_COMMON=y
-PTXCONF_BAREBOX_COMMON_VERSION="2025.05.0"
-PTXCONF_BAREBOX_COMMON_MD5="22046ac9b06e570a51e945c633a2b24c"
+PTXCONF_BAREBOX_COMMON_VERSION="2025.06.0"
+PTXCONF_BAREBOX_COMMON_MD5="2b46a55d81cfae91c72511b15b7f5957"
 PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
 PTXCONF_BAREBOX_AM335X_MLO=y
 PTXCONF_BAREBOX_AT91=y
 PTXCONF_BAREBOX_ARCH_STRING="arm"
 PTXCONF_BAREBOX_DEPENDENCIES=y
 PTXCONF_BAREBOX=y
-PTXCONF_BAREBOX_VERSION="2025.05.0"
+PTXCONF_BAREBOX_VERSION="2025.06.0"
 PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION=y
 PTXCONF_BAREBOX_BUILDSYSTEM_VERSION="${PTXDIST_VCS_VERSION}"
-PTXCONF_BAREBOX_MD5="22046ac9b06e570a51e945c633a2b24c"
+PTXCONF_BAREBOX_MD5="2b46a55d81cfae91c72511b15b7f5957"
 PTXCONF_BAREBOX_CONFIG="barebox.config"
 # PTXCONF_BAREBOX_FIRMWARE is not set
 PTXCONF_BAREBOX_EXTRA_ENV=y
-- 
2.39.5

Re: [DistroKit] [PATCH] v7a: barebox: version bump 2025.05.0 -> 2025.06.0

[Robert Schwebel]

On Mon, Jun 23, 2025 at 11:23:38AM +0200, Roland Hieber wrote:
> Barebox commit 9c3afd5083a3 (included in v2025.06.0) fixes an error
> message with the OMAP RNG on Beaglebone:
> 
>   ERROR: omap_rng 48310000.rng@0.of: initialization failed.
>   ERROR: omap_rng 48310000.rng@0.of: initialization failed.
>   ERROR: omap_rng 48310000.rng@0.of: probe failed: Device or resource busy
> 
> Bump the version number, run oldconfig with defaults, and update the
> remaining platform-specific bareboxes as well.
> 
> Link: https://git.pengutronix.de/cgit/barebox/commit/?id=9c3afd5083a3
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  configs/platform-v7a/barebox-am335x-mlo.config | 2 +-
>  configs/platform-v7a/barebox-at91.config       | 2 +-
>  configs/platform-v7a/barebox-at91.config.diff  | 4 ++--
>  configs/platform-v7a/barebox-common.config     | 4 ++--
>  configs/platform-v7a/barebox.config            | 4 ++--
>  configs/platform-v7a/platformconfig            | 8 ++++----
>  6 files changed, 12 insertions(+), 12 deletions(-)

Applied to next, thx!

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |

[DistroKit] [PATCH] fixup! v7a: barebox: version bump 2025.05.0 -> 2025.06.0

[Roland Hieber]

[rhi: ptxdist-2025.06.0 now writes two checksums in kconfig diffs]
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
Robert, can you squash this into my original patch? I didn't expect that
it would be applied after Fabian's PTXdist 2025.06.0 update, which
now writes two checksums in config diffs.

 - Roland

 configs/platform-v7a/barebox-at91.config.diff | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
index 162ed9f4791e..cf3de80f23f2 100644
--- a/configs/platform-v7a/barebox-at91.config.diff
+++ b/configs/platform-v7a/barebox-at91.config.diff
@@ -1,4 +1,5 @@
 0cb3165d3c2844da9a6d01e5407289ca
+b2da2644182531b3b6a4a2c9ec7ff908
 CONFIG_ARCH_AT91=y
 # CONFIG_ARCH_BCM283X is not set
 # CONFIG_ARCH_IMX is undefined
-- 
2.39.5

Re: [DistroKit] [PATCH] fixup! v7a: barebox: version bump 2025.05.0 -> 2025.06.0

[Robert Schwebel]

Applied & squashed into original patch in next.

On Wed, Jun 25, 2025 at 03:13:39PM +0200, Roland Hieber wrote:
> [rhi: ptxdist-2025.06.0 now writes two checksums in kconfig diffs]
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> Robert, can you squash this into my original patch? I didn't expect that
> it would be applied after Fabian's PTXdist 2025.06.0 update, which
> now writes two checksums in config diffs.
> 
>  - Roland
> 
>  configs/platform-v7a/barebox-at91.config.diff | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
> index 162ed9f4791e..cf3de80f23f2 100644
> --- a/configs/platform-v7a/barebox-at91.config.diff
> +++ b/configs/platform-v7a/barebox-at91.config.diff
> @@ -1,4 +1,5 @@
>  0cb3165d3c2844da9a6d01e5407289ca
> +b2da2644182531b3b6a4a2c9ec7ff908
>  CONFIG_ARCH_AT91=y
>  # CONFIG_ARCH_BCM283X is not set
>  # CONFIG_ARCH_IMX is undefined
> -- 
> 2.39.5
> 
> 
> 

-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |

Re: [DistroKit] [PATCH] fixup! v7a: barebox: version bump 2025.05.0 -> 2025.06.0

[Robert Schwebel]

Could you rebase to next? This does not apply any more.

On Wed, Jun 25, 2025 at 07:36:31PM +0200, Robert Schwebel wrote:
> Applied & squashed into original patch in next.
> 
> On Wed, Jun 25, 2025 at 03:13:39PM +0200, Roland Hieber wrote:
> > [rhi: ptxdist-2025.06.0 now writes two checksums in kconfig diffs]
> > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > ---
> > Robert, can you squash this into my original patch? I didn't expect that
> > it would be applied after Fabian's PTXdist 2025.06.0 update, which
> > now writes two checksums in config diffs.
> > 
> >  - Roland
> > 
> >  configs/platform-v7a/barebox-at91.config.diff | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
> > index 162ed9f4791e..cf3de80f23f2 100644
> > --- a/configs/platform-v7a/barebox-at91.config.diff
> > +++ b/configs/platform-v7a/barebox-at91.config.diff
> > @@ -1,4 +1,5 @@
> >  0cb3165d3c2844da9a6d01e5407289ca
> > +b2da2644182531b3b6a4a2c9ec7ff908
> >  CONFIG_ARCH_AT91=y
> >  # CONFIG_ARCH_BCM283X is not set
> >  # CONFIG_ARCH_IMX is undefined
> > -- 
> > 2.39.5
> > 
> > 
> > 
> 
> -- 
> Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
> Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |
> 
> 

-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |

Re: [DistroKit] [PATCH] fixup! v7a: barebox: version bump 2025.05.0 -> 2025.06.0

[Roland Hieber]

On Wed, Jun 25, 2025 at 07:38:21PM +0200, Robert Schwebel wrote:
> Could you rebase to next? This does not apply any more.

It looks to me like this patch is already fixed-up in commit c7a728d78d49
(upstream/next) Mo 2025-06-23 11:23:38 (Roland Hieber) "v7a: barebox: version
bump 2025.05.0 -> 2025.06.0". But the other one ("fixup! ptxdist: version bump
2025.05 -> 2025.06") is not yet. However, if I rebase on top of c7a728d78d49, it
doesn't seem to change the patch content of that fixup. 

I've pushed my 'next' branch to ssh://public@git.pengutronix.de/rhi/DistroKit so
you could have a look if you want (Note that I also changed it from a "fixup!"
to a "squash!" so my additional log message doesn't get lost in rebasing).

 - Roland

> 
> On Wed, Jun 25, 2025 at 07:36:31PM +0200, Robert Schwebel wrote:
> > Applied & squashed into original patch in next.
> > 
> > On Wed, Jun 25, 2025 at 03:13:39PM +0200, Roland Hieber wrote:
> > > [rhi: ptxdist-2025.06.0 now writes two checksums in kconfig diffs]
> > > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > > ---
> > > Robert, can you squash this into my original patch? I didn't expect that
> > > it would be applied after Fabian's PTXdist 2025.06.0 update, which
> > > now writes two checksums in config diffs.
> > > 
> > >  - Roland
> > > 
> > >  configs/platform-v7a/barebox-at91.config.diff | 1 +
> > >  1 file changed, 1 insertion(+)
> > > 
> > > diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
> > > index 162ed9f4791e..cf3de80f23f2 100644
> > > --- a/configs/platform-v7a/barebox-at91.config.diff
> > > +++ b/configs/platform-v7a/barebox-at91.config.diff
> > > @@ -1,4 +1,5 @@
> > >  0cb3165d3c2844da9a6d01e5407289ca
> > > +b2da2644182531b3b6a4a2c9ec7ff908
> > >  CONFIG_ARCH_AT91=y
> > >  # CONFIG_ARCH_BCM283X is not set
> > >  # CONFIG_ARCH_IMX is undefined
> > > -- 
> > > 2.39.5
> > > 
> > > 
> > > 
> > 
> > -- 
> > Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
> > Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
> > 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> > Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |
> > 
> > 
> 
> -- 
> Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
> Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |
> 

-- 
Roland Hieber, Pengutronix e.K.          | rhi@pengutronix.de          |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |

Re: [DistroKit] [PATCH] fixup! v7a: barebox: version bump 2025.05.0 -> 2025.06.0

[Roland Hieber]

On Thu, Jun 26, 2025 at 11:03:19AM +0200, Roland Hieber wrote:
> On Wed, Jun 25, 2025 at 07:38:21PM +0200, Robert Schwebel wrote:
> > Could you rebase to next? This does not apply any more.
> 
> It looks to me like this patch is already fixed-up in commit c7a728d78d49
> (upstream/next) Mo 2025-06-23 11:23:38 (Roland Hieber) "v7a: barebox: version
> bump 2025.05.0 -> 2025.06.0". But the other one ("fixup! ptxdist: version bump
> 2025.05 -> 2025.06") is not yet. However, if I rebase on top of c7a728d78d49, it
> doesn't seem to change the patch content of that fixup. 
> 
> I've pushed my 'next' branch to ssh://public@git.pengutronix.de/rhi/DistroKit so
> you could have a look if you want (Note that I also changed it from a "fixup!"
> to a "squash!" so my additional log message doesn't get lost in rebasing).

I've sent the squashed version in
https://lore.distrokit.org/distrokit/20250627123252.1985354-1-rhi@pengutronix.de/
, it can be applied before c7a728d78d49 (current next branch) instead of
4e6825497be6.

 - Roland

> > On Wed, Jun 25, 2025 at 07:36:31PM +0200, Robert Schwebel wrote:
> > > Applied & squashed into original patch in next.
> > > 
> > > On Wed, Jun 25, 2025 at 03:13:39PM +0200, Roland Hieber wrote:
> > > > [rhi: ptxdist-2025.06.0 now writes two checksums in kconfig diffs]
> > > > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > > > ---
> > > > Robert, can you squash this into my original patch? I didn't expect that
> > > > it would be applied after Fabian's PTXdist 2025.06.0 update, which
> > > > now writes two checksums in config diffs.
> > > > 
> > > >  - Roland
> > > > 
> > > >  configs/platform-v7a/barebox-at91.config.diff | 1 +
> > > >  1 file changed, 1 insertion(+)
> > > > 
> > > > diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
> > > > index 162ed9f4791e..cf3de80f23f2 100644
> > > > --- a/configs/platform-v7a/barebox-at91.config.diff
> > > > +++ b/configs/platform-v7a/barebox-at91.config.diff
> > > > @@ -1,4 +1,5 @@
> > > >  0cb3165d3c2844da9a6d01e5407289ca
> > > > +b2da2644182531b3b6a4a2c9ec7ff908
> > > >  CONFIG_ARCH_AT91=y
> > > >  # CONFIG_ARCH_BCM283X is not set
> > > >  # CONFIG_ARCH_IMX is undefined
> > > > -- 
> > > > 2.39.5
> > > > 
> > > > 
> > > > 
> > > 
> > > -- 
> > > Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
> > > Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
> > > 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> > > Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |
> > > 
> > > 
> > 
> > -- 
> > Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
> > Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
> > 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> > Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |
> > 
> 
> -- 
> Roland Hieber, Pengutronix e.K.          | rhi@pengutronix.de          |
> Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
> 31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |
> 
> 

-- 
Roland Hieber, Pengutronix e.K.          | rhi@pengutronix.de          |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |