[openwrt/openwrt] ipq806x: 5.15: add boot-partitions binding to fix block warning

LEDE Commits lede-commits at lists.infradead.org
Tue Oct 11 12:29:11 PDT 2022


ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/6134ba4a34db8768cea0df487cb1e2a1400b90b2

commit 6134ba4a34db8768cea0df487cb1e2a1400b90b2
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Thu Jun 16 22:32:35 2022 +0200

    ipq806x: 5.15: add boot-partitions binding to fix block warning
    
    The patch has changed implementation and now the binding has changed.
    Replace the old binding with boot-partitions and reimplement the
    definition with the new definition.
    The new definition is:
    <offset1 size1 offset2 size2 offset3 ...>
    and now supports sparsed patch.
    
    Also add missing binding in some dts and add the backup boot partition
    to the boot-partitions list.
    
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 .../linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-d7800.dts   | 2 +-
 .../linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-eax500.dtsi | 2 +-
 target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-g10.dts  | 2 +-
 .../linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-r7500.dts   | 2 +-
 .../linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts | 2 +-
 .../linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts  | 2 +-
 .../ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8065-nighthawk.dtsi    | 2 +-
 .../ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts  | 2 ++
 .../ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8065-tr4400-v2.dts     | 2 ++
 .../files-5.15/arch/arm/boot/dts/qcom-ipq8068-cryptid-common.dtsi       | 2 +-
 10 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
index f9f9c035d3..719b9c86c5 100644
--- a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
+++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
@@ -243,7 +243,7 @@
 		nand-ecc-step-size = <512>;
 
 		nand-is-boot-medium;
-		qcom,boot_pages_size = <0x1180000>;
+		qcom,boot-partitions = <0x0 0x1180000>;
 
 		partitions {
 			compatible = "fixed-partitions";
diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-eax500.dtsi b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-eax500.dtsi
index 68e5b24704..b9b296094b 100644
--- a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-eax500.dtsi
+++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-eax500.dtsi
@@ -46,7 +46,7 @@
 		nand-ecc-step-size = <512>;
 
 		nand-is-boot-medium;
-		qcom,boot_pages_size = <0x0c80000>;
+		qcom,boot-partitions = <0x0 0x0c80000>;
 
 		partitions: partitions {
 			compatible = "fixed-partitions";
diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-g10.dts b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-g10.dts
index ba27d89c05..75b02a00d0 100644
--- a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-g10.dts
+++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-g10.dts
@@ -238,7 +238,7 @@
 		nand-ecc-step-size = <512>;
 
 		nand-is-boot-medium;
-		qcom,boot_pages_size = <0x1200000>;
+		qcom,boot-partitions = <0x0 0x1200000>;
 
 		partitions {
 			compatible = "qcom,smem-part";
diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
index 1505e23f38..aa783e7ee6 100644
--- a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
+++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
@@ -176,7 +176,7 @@
 		nand-ecc-step-size = <512>;
 
 		nand-is-boot-medium;
-		qcom,boot_pages_size = <0x1180000>;
+		qcom,boot-partitions = <0x0 0x1180000>;
 
 		partitions {
 			compatible = "fixed-partitions";
diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
index b43ee90034..23a32697e1 100644
--- a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
+++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
@@ -240,7 +240,7 @@
 		nand-ecc-step-size = <512>;
 
 		nand-is-boot-medium;
-		qcom,boot_pages_size = <0x1180000>;
+		qcom,boot-partitions = <0x0 0x1180000>;
 
 		partitions {
 			compatible = "fixed-partitions";
diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
index d7f3a7f881..983a4243db 100644
--- a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
+++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
@@ -119,7 +119,7 @@
 		nand-ecc-step-size = <512>;
 
 		nand-is-boot-medium;
-		qcom,boot_pages_size = <0x1180000>;
+		qcom,boot-partitions = <0x0 0x1180000 0x5340000 0x6400000>;
 
 		partitions {
 			compatible = "fixed-partitions";
diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8065-nighthawk.dtsi b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8065-nighthawk.dtsi
index 6c007e2c16..420b540132 100644
--- a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8065-nighthawk.dtsi
+++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8065-nighthawk.dtsi
@@ -232,7 +232,7 @@
 		nand-ecc-step-size = <512>;
 
 		nand-is-boot-medium;
-		qcom,boot_pages_size = <0x1180000>;
+		qcom,boot-partitions = <0x0 0x1180000>;
 
 		partitions: partitions {
 			compatible = "fixed-partitions";
diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts
index 51ef2c3321..902f7d6098 100644
--- a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts
+++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts
@@ -138,6 +138,8 @@
 		nand-bus-width = <8>;
 		nand-ecc-step-size = <512>;
 
+		qcom,boot-partitions = <0x0 0x1180000 0x1340000 0x2400000>;
+
 		partitions {
 			compatible = "fixed-partitions";
 			#address-cells = <1>;
diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8065-tr4400-v2.dts b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8065-tr4400-v2.dts
index 9244639137..db9bab18dd 100644
--- a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8065-tr4400-v2.dts
+++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8065-tr4400-v2.dts
@@ -127,6 +127,8 @@
 		nand-bus-width = <8>;
 		nand-ecc-step-size = <512>;
 
+		qcom,boot-partitions = <0x0 0x1180000 0x5340000 0x6400000>;
+
 		partitions {
 			compatible = "fixed-partitions";
 			#address-cells = <1>;
diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8068-cryptid-common.dtsi b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8068-cryptid-common.dtsi
index 93b9aa86f7..a8f43591f9 100644
--- a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8068-cryptid-common.dtsi
+++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8068-cryptid-common.dtsi
@@ -150,7 +150,7 @@
 		nand-ecc-step-size = <512>;
 
 		nand-is-boot-medium;
-		qcom,boot_pages_size = <0x2140000>;
+		qcom,boot-partitions = <0x0 0x2140000>;
 
 		partitions {
 			compatible = "fixed-partitions";




More information about the lede-commits mailing list