From f7872bfd3697b0228e6eeeae27da87c9730fe2d2 Mon Sep 17 00:00:00 2001
From: Sven-Ola Tuecke <sven-ola@gmx.de>
Date: Sun, 11 Jan 2026 21:12:45 +0100
Subject: [PATCH] OrangePi-RV2: SPI NOR partitioning (prep for boot-from-flash)

Signed-off-by: Sven-Ola Tuecke <sven-ola@gmx.de>
---
 .../spacemit-6.18/dt/x1_orangepi-r2s.dts      | 36 +++++++++++++++++++
 .../spacemit-6.18/dt/x1_orangepi-rv2.dts      | 36 +++++++++++++++++++
 .../spacemit-6.6/dt/x1_orangepi-r2s.dts       | 36 +++++++++++++++++++
 .../spacemit-6.6/dt/x1_orangepi-rv2.dts       | 36 +++++++++++++++++++
 4 files changed, 144 insertions(+)

diff --git a/patch/kernel/archive/spacemit-6.18/dt/x1_orangepi-r2s.dts b/patch/kernel/archive/spacemit-6.18/dt/x1_orangepi-r2s.dts
index 5614cb62ff..aff46c8e44 100644
--- a/patch/kernel/archive/spacemit-6.18/dt/x1_orangepi-r2s.dts
+++ b/patch/kernel/archive/spacemit-6.18/dt/x1_orangepi-r2s.dts
@@ -810,6 +810,42 @@
 		m25p,fast-read;
 		broken-flash-reset;
 		status = "okay";
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@00000 {
+				label = "bootinfo";
+				reg = <0x00000 0x10000>;
+			};
+
+			partition@10000 {
+				label = "private";
+				reg = <0x10000 0x10000>;
+			};
+
+			partition@20000 {
+				label = "fsbl";
+				reg = <0x20000 0x40000>;
+			};
+
+			partition@60000 {
+				label = "env";
+				reg = <0x60000 0x10000>;
+			};
+
+			partition@70000 {
+				label = "opensbi";
+				reg = <0x70000 0x30000>;
+			};
+
+			partition@a0000 {
+				label = "uboot";
+				reg = <0xa0000 0xf60000>;
+			};
+		};
 	};
 };
 
diff --git a/patch/kernel/archive/spacemit-6.18/dt/x1_orangepi-rv2.dts b/patch/kernel/archive/spacemit-6.18/dt/x1_orangepi-rv2.dts
index d4b9b8d6fc..c3c916571b 100644
--- a/patch/kernel/archive/spacemit-6.18/dt/x1_orangepi-rv2.dts
+++ b/patch/kernel/archive/spacemit-6.18/dt/x1_orangepi-rv2.dts
@@ -983,6 +983,42 @@
 		m25p,fast-read;
 		broken-flash-reset;
 		status = "okay";
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@00000 {
+				label = "bootinfo";
+				reg = <0x00000 0x10000>;
+			};
+
+			partition@10000 {
+				label = "private";
+				reg = <0x10000 0x10000>;
+			};
+
+			partition@20000 {
+				label = "fsbl";
+				reg = <0x20000 0x40000>;
+			};
+
+			partition@60000 {
+				label = "env";
+				reg = <0x60000 0x10000>;
+			};
+
+			partition@70000 {
+				label = "opensbi";
+				reg = <0x70000 0x30000>;
+			};
+
+			partition@a0000 {
+				label = "uboot";
+				reg = <0xa0000 0xf60000>;
+			};
+		};
 	};
 };
 
diff --git a/patch/kernel/archive/spacemit-6.6/dt/x1_orangepi-r2s.dts b/patch/kernel/archive/spacemit-6.6/dt/x1_orangepi-r2s.dts
index 5614cb62ff..aff46c8e44 100644
--- a/patch/kernel/archive/spacemit-6.6/dt/x1_orangepi-r2s.dts
+++ b/patch/kernel/archive/spacemit-6.6/dt/x1_orangepi-r2s.dts
@@ -810,6 +810,42 @@
 		m25p,fast-read;
 		broken-flash-reset;
 		status = "okay";
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@00000 {
+				label = "bootinfo";
+				reg = <0x00000 0x10000>;
+			};
+
+			partition@10000 {
+				label = "private";
+				reg = <0x10000 0x10000>;
+			};
+
+			partition@20000 {
+				label = "fsbl";
+				reg = <0x20000 0x40000>;
+			};
+
+			partition@60000 {
+				label = "env";
+				reg = <0x60000 0x10000>;
+			};
+
+			partition@70000 {
+				label = "opensbi";
+				reg = <0x70000 0x30000>;
+			};
+
+			partition@a0000 {
+				label = "uboot";
+				reg = <0xa0000 0xf60000>;
+			};
+		};
 	};
 };
 
diff --git a/patch/kernel/archive/spacemit-6.6/dt/x1_orangepi-rv2.dts b/patch/kernel/archive/spacemit-6.6/dt/x1_orangepi-rv2.dts
index d4b9b8d6fc..c3c916571b 100644
--- a/patch/kernel/archive/spacemit-6.6/dt/x1_orangepi-rv2.dts
+++ b/patch/kernel/archive/spacemit-6.6/dt/x1_orangepi-rv2.dts
@@ -983,6 +983,42 @@
 		m25p,fast-read;
 		broken-flash-reset;
 		status = "okay";
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@00000 {
+				label = "bootinfo";
+				reg = <0x00000 0x10000>;
+			};
+
+			partition@10000 {
+				label = "private";
+				reg = <0x10000 0x10000>;
+			};
+
+			partition@20000 {
+				label = "fsbl";
+				reg = <0x20000 0x40000>;
+			};
+
+			partition@60000 {
+				label = "env";
+				reg = <0x60000 0x10000>;
+			};
+
+			partition@70000 {
+				label = "opensbi";
+				reg = <0x70000 0x30000>;
+			};
+
+			partition@a0000 {
+				label = "uboot";
+				reg = <0xa0000 0xf60000>;
+			};
+		};
 	};
 };