* [DistroKit] [PATCH 1/2] v7a: barebox: version bump 2025.06.0 -> 2025.06.1
@ 2025-06-30 11:11 Roland Hieber
2025-06-30 11:11 ` [DistroKit] [PATCH 2/2] v7a: vexpress: harmonize barebox partition layout Roland Hieber
0 siblings, 1 reply; 2+ messages in thread
From: Roland Hieber @ 2025-06-30 11:11 UTC (permalink / raw)
To: distrokit; +Cc: Ahmad Fatoum, Roland Hieber
Barebox 2025.06.0 introduced a regression for creating files on FAT
partitions, which breaks environment handling on RPi 3 and Beaglebone.
This is fixed in 2025.06.1.
Suggested-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
Note: this applies on top of
"[PATCH v3] ptxdist: version bump 2025.05.0 -> 2025.06.0"
https://lore.distrokit.org/distrokit/20250627123252.1985354-1-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 | 2 +-
configs/platform-v7a/barebox.config | 2 +-
configs/platform-v7a/platformconfig | 8 ++++----
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config
index 7e71c0ba5838..80c895567d7d 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.06.0 Configuration
+# Barebox/arm 2025.06.1 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 eccb44d9517c..fc854edb440f 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.06.0 Configuration
+# Barebox/arm 2025.06.1 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 cf3de80f23f2..16b5560fb14e 100644
--- a/configs/platform-v7a/barebox-at91.config.diff
+++ b/configs/platform-v7a/barebox-at91.config.diff
@@ -1,5 +1,5 @@
0cb3165d3c2844da9a6d01e5407289ca
-b2da2644182531b3b6a4a2c9ec7ff908
+a113ae91a19f37cefe79fbd73dc0e06f
CONFIG_ARCH_AT91=y
# CONFIG_ARCH_BCM283X is not set
# CONFIG_ARCH_IMX is undefined
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index 5420a6de68d2..b2b4b29643ca 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.06.0 Configuration
+# Barebox/arm 2025.06.1 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index e7b6a912859f..014300e86e42 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.06.0"
-PTXCONF_BAREBOX_COMMON_MD5="2b46a55d81cfae91c72511b15b7f5957"
+PTXCONF_BAREBOX_COMMON_VERSION="2025.06.1"
+PTXCONF_BAREBOX_COMMON_MD5="b2ba4b194894fb6c4848d260f4e849ff"
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.06.0"
+PTXCONF_BAREBOX_VERSION="2025.06.1"
PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION=y
PTXCONF_BAREBOX_BUILDSYSTEM_VERSION="${PTXDIST_VCS_VERSION}"
-PTXCONF_BAREBOX_MD5="2b46a55d81cfae91c72511b15b7f5957"
+PTXCONF_BAREBOX_MD5="b2ba4b194894fb6c4848d260f4e849ff"
PTXCONF_BAREBOX_CONFIG="barebox.config"
# PTXCONF_BAREBOX_FIRMWARE is not set
PTXCONF_BAREBOX_EXTRA_ENV=y
--
2.39.5
^ permalink raw reply [flat|nested] 2+ messages in thread* [DistroKit] [PATCH 2/2] v7a: vexpress: harmonize barebox partition layout
2025-06-30 11:11 [DistroKit] [PATCH 1/2] v7a: barebox: version bump 2025.06.0 -> 2025.06.1 Roland Hieber
@ 2025-06-30 11:11 ` Roland Hieber
0 siblings, 0 replies; 2+ messages in thread
From: Roland Hieber @ 2025-06-30 11:11 UTC (permalink / raw)
To: distrokit; +Cc: Ahmad Fatoum, Roland Hieber
Since commit 5c519849029d ("v7a: vexpress: switch to upstream barebox
recipe"), we switched to the upstream barebox recipe for the vexpress
platform, which increased the size of the barebox binary to 940KiB.
However, due to the fixed partition layout in the vexpress device trees,
barebox still thinks that the environment partition starts at offset
512K, so executing a "saveenv" will overwrite the barebox image in NOR
flash, and Qemu will fail to boot on the next run.
Pick a patch from the mailing list that increases the fixed barebox
and the environment partitions in the device tree 2M each, and harmonize
our genimage setup too.
Suggested-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
Note: this applies on top of
"[PATCH v3] ptxdist: version bump 2025.05.0 -> 2025.06.0"
https://lore.distrokit.org/distrokit/20250627123252.1985354-1-rhi@pengutronix.de
.../config/images/vexpress-nor.config | 4 +-
...ress-increase-barebox-partition-size.patch | 74 +++++++++++++++++++
patches/barebox-2025.06.1/series | 4 +
3 files changed, 81 insertions(+), 1 deletion(-)
create mode 100644 patches/barebox-2025.06.1/0001-ARM-vexpress-increase-barebox-partition-size.patch
create mode 100644 patches/barebox-2025.06.1/series
diff --git a/configs/platform-v7a/config/images/vexpress-nor.config b/configs/platform-v7a/config/images/vexpress-nor.config
index 6dc983325ee5..5b6c6ebf6424 100644
--- a/configs/platform-v7a/config/images/vexpress-nor.config
+++ b/configs/platform-v7a/config/images/vexpress-nor.config
@@ -5,6 +5,8 @@ image @IMAGE@ {
partition-table-type = none
fill = true
}
+ /* Keep these partitions in sync with the fixed partition layout in
+ barebox/arch/arm/dts/vexpress-v2p-ca*.dts! */
partition barebox {
image = barebox-vexpress-ca9.img
offset = 0
@@ -18,7 +20,7 @@ image @IMAGE@ {
}
partition barebox-state {
image = /dev/null
- offset = 3M
+ offset = 4M
in-partition-table = false
size = 1M
}
diff --git a/patches/barebox-2025.06.1/0001-ARM-vexpress-increase-barebox-partition-size.patch b/patches/barebox-2025.06.1/0001-ARM-vexpress-increase-barebox-partition-size.patch
new file mode 100644
index 000000000000..db5d40032ee9
--- /dev/null
+++ b/patches/barebox-2025.06.1/0001-ARM-vexpress-increase-barebox-partition-size.patch
@@ -0,0 +1,74 @@
+From: Ahmad Fatoum <a.fatoum@pengutronix.de>
+Date: Tue, 24 Jun 2025 20:39:30 +0200
+Subject: [PATCH] ARM: vexpress: increase barebox partition size
+
+Commit 3630fa400be5 ("ARM: remove vexpress_defconfig") made
+multi_v7_defconfig the go-to defconfig for vexpress.
+
+The multi defconfig enables a lot of drivers and functionality though
+increasing the image size from 300K to 1.2M, which causes barebox to
+extend beyond the previously configured 512K barebox partition.
+
+Fix this by giving each of barebox and its environment 2M of space,
+which should be enough for many years to come.
+
+Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
+[rhi: picked from https://lore.barebox.org/barebox/20250624183930.2733353-1-a.fatoum@pengutronix.de/ ]
+Signed-off-by: Roland Hieber <rhi@pengutronix.de>
+---
+ arch/arm/dts/vexpress-v2p-ca15.dts | 11 ++++++++---
+ arch/arm/dts/vexpress-v2p-ca9.dts | 10 +++++-----
+ 2 files changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/arch/arm/dts/vexpress-v2p-ca15.dts b/arch/arm/dts/vexpress-v2p-ca15.dts
+index acf4e023d5cd..891e6dbbe4b4 100644
+--- a/arch/arm/dts/vexpress-v2p-ca15.dts
++++ b/arch/arm/dts/vexpress-v2p-ca15.dts
+@@ -19,12 +19,17 @@ partitions {
+
+ partition@0 {
+ label = "barebox";
+- reg = <0x0 0x80000>;
++ reg = <0x0 0x200000>;
+ };
+
+- barebox_env: partition@80000 {
++ barebox_env: partition@200000 {
+ label = "barebox-environment";
+- reg = <0x80000 0x80000>;
++ reg = <0x200000 0x200000>;
++ };
++
++ state_storage: partition@400000 {
++ label = "barebox-state";
++ reg = <0x400000 0x100000>;
+ };
+ };
+ };
+diff --git a/arch/arm/dts/vexpress-v2p-ca9.dts b/arch/arm/dts/vexpress-v2p-ca9.dts
+index d1484ff4b0a9..c320f67c2371 100644
+--- a/arch/arm/dts/vexpress-v2p-ca9.dts
++++ b/arch/arm/dts/vexpress-v2p-ca9.dts
+@@ -77,17 +77,17 @@ partitions {
+
+ partition@0 {
+ label = "barebox";
+- reg = <0x0 0x80000>;
++ reg = <0x0 0x200000>;
+ };
+
+- barebox_env: partition@80000 {
++ barebox_env: partition@200000 {
+ label = "barebox-environment";
+- reg = <0x80000 0x80000>;
++ reg = <0x200000 0x200000>;
+ };
+
+- state_storage: partition@100000 {
++ state_storage: partition@400000 {
+ label = "barebox-state";
+- reg = <0x100000 0x100000>;
++ reg = <0x400000 0x100000>;
+ };
+ };
+ };
diff --git a/patches/barebox-2025.06.1/series b/patches/barebox-2025.06.1/series
new file mode 100644
index 000000000000..e04bbe55d2d4
--- /dev/null
+++ b/patches/barebox-2025.06.1/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-ARM-vexpress-increase-barebox-partition-size.patch
+# 292dd68941cabc5983505876cd411f46 - git-ptx-patches magic
--
2.39.5
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-06-30 11:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-06-30 11:11 [DistroKit] [PATCH 1/2] v7a: barebox: version bump 2025.06.0 -> 2025.06.1 Roland Hieber
2025-06-30 11:11 ` [DistroKit] [PATCH 2/2] v7a: vexpress: harmonize barebox partition layout Roland Hieber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox