From ad98915e765b04bc58abbf4ed3a1e4410adc642d Mon Sep 17 00:00:00 2001
From: aiamadeus <2789289348@qq.com>
Date: Thu, 13 Jul 2023 23:19:21 +0800
Subject: [PATCH] ipq40xx: try to fixes booting issue

No testing since there is no board.
---
 .../files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts |  6 +++++-
 .../files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi   | 10 +++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts
index ba6aabdc9c1dc2..4c79ecb101853f 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts
@@ -16,6 +16,10 @@
 		led-upgrade = &led_sys;
 	};
 
+	chosen {
+		bootargs-append = " ubi.block=0,1 root=/dev/ubiblock0_1";
+	};
+
 	soc {
 		rng@22000 {
 			status = "okay";
@@ -306,7 +310,7 @@
 			};
 
 			partition@b80000 {
-				label = "ubi";
+				label = "rootfs";
 				reg = <0xb80000 0x7480000>;
 			};
 		};
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi
index 87e0d103b71b53..43f655c1e815d4 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi
@@ -7,10 +7,6 @@
 #include <dt-bindings/leds/common.h>
 
 / {
-	chosen {
-		bootargs-append = " ubi.mtd=ubi root=/dev/ubiblock0_1";
-	};
-
 	aliases {
 		led-boot = &led_sys;
 		led-failsafe = &led_sys;
@@ -19,6 +15,10 @@
 		label-mac-device = &gmac0;
 	};
 
+	chosen {
+		bootargs-append = " root=/dev/ubiblock0_1";
+	};
+
 	soc {
 		rng@22000 {
 			status = "okay";
@@ -212,7 +212,7 @@
 			#size-cells = <1>;
 
 			nand_rootfs: partition@0 {
-				label = "ubi";
+				label = "rootfs";
 				/* reg defined in 64M/128M variant dts. */
 			};
 		};