ipq40xx: try to fixes booting issue

No testing since there is no board.
coolsnowwolf · Sep 16, 2023 · ad98915 · ad98915
1 parent 45107fc
commit ad98915
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 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
@@ -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
@@ -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. */
 			};
 		};