[PATCH v2] ARM: vexpress: increase barebox partition size

[PATCH v2] ARM: vexpress: increase barebox partition size

[Ahmad Fatoum]

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>
---
v1 -> v2:
  - mention how much to reserve for barebox in migration guide
  - reserve state partition for CA15 as well
---
 .../migration-guides/migration-2025.08.0.rst          |  8 ++++++++
 arch/arm/dts/vexpress-v2p-ca15.dts                    | 11 ++++++++---
 arch/arm/dts/vexpress-v2p-ca9.dts                     | 10 +++++-----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/Documentation/migration-guides/migration-2025.08.0.rst b/Documentation/migration-guides/migration-2025.08.0.rst
index da60132e7d8c..b40119ac672b 100644
--- a/Documentation/migration-guides/migration-2025.08.0.rst
+++ b/Documentation/migration-guides/migration-2025.08.0.rst
@@ -6,3 +6,11 @@ Bootchooser
 
 Bootchooser now interprets a top-level ``attempts_locked`` variable.
 For more information, see :ref:`attempts lock feature <bootchooser,attempts_lock>`
+
+Board support
+-------------
+
+The hardcoded Vexpress partition layout for barebox, its environment and state
+have been changed. The first 5M of the NOR flash should now be reserved for
+barebox use. barebox will, by default, fix up the new partition layout into
+the kernel device tree.
diff --git a/arch/arm/dts/vexpress-v2p-ca15.dts b/arch/arm/dts/vexpress-v2p-ca15.dts
index 4c86f4acd80c..945d9496c231 100644
--- a/arch/arm/dts/vexpress-v2p-ca15.dts
+++ b/arch/arm/dts/vexpress-v2p-ca15.dts
@@ -21,12 +21,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 51ae830a95fb..742e0ab17a36 100644
--- a/arch/arm/dts/vexpress-v2p-ca9.dts
+++ b/arch/arm/dts/vexpress-v2p-ca9.dts
@@ -79,17 +79,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>;
 		};
 	};
 };
-- 
2.39.5