浏览代码

mediatek: wait for fitblk rootfs

Probing of the fitblk driver in some situations happens after the kernel
attempts to mount rootfs, which then fails.
Always use 'rootwait' when using fitblk for rootfs.

Signed-off-by: Daniel Golle <[email protected]>
Daniel Golle 1 年之前
父节点
当前提交
cd4de3251c

+ 1 - 1
target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts

@@ -13,7 +13,7 @@
 
 	chosen {
 		rootdisk = <&ubi_rootfs>;
-		bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n1 swiotlb=512 ubi.block=0,fit root=/dev/fit0";
+		bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n1 swiotlb=512 ubi.block=0,fit root=/dev/fit0 rootwait";
 	};
 };
 

+ 1 - 1
target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1-ubootmod.dts

@@ -8,7 +8,7 @@
 
 	chosen {
 		rootdisk = <&rootdisk>;
-		bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512 console=ttyS0,115200n8 root=/dev/fit0";
+		bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512 console=ttyS0,115200n8 root=/dev/fit0 rootwait";
 	};
 };
 

+ 1 - 1
target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v2-ubootmod.dts

@@ -8,7 +8,7 @@
 
 	chosen {
 		rootdisk = <&rootdisk>;
-		bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512 console=ttyS0,115200n8 root=/dev/fit0";
+		bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512 console=ttyS0,115200n8 root=/dev/fit0 rootwait";
 	};
 };
 

+ 1 - 1
target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v3-ubootmod.dts

@@ -8,7 +8,7 @@
 
 	chosen {
 		rootdisk = <&rootdisk>;
-		bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512 console=ttyS0,115200n8 root=/dev/fit0";
+		bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512 console=ttyS0,115200n8 root=/dev/fit0 rootwait";
 	};
 };
 

+ 1 - 1
target/linux/mediatek/dts/mt7623a-unielec-u7623-02.dts

@@ -12,7 +12,7 @@
 
 	chosen {
 		stdout-path = "serial0:115200n8";
-		bootargs = "earlycon=uart8250,mmio32,0x11004000 root=/dev/fit0";
+		bootargs = "earlycon=uart8250,mmio32,0x11004000 root=/dev/fit0 rootwait";
 		rootdisk = <&emmc_rootdisk>;
 	};
 };

+ 1 - 0
target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000-ubootmod.dts

@@ -10,6 +10,7 @@
 
 &chosen {
 	rootdisk = <&ubi_rootdisk>;
+	bootargs-append = " root=/dev/fit0 rootwait";
 };
 
 &partitions {

+ 1 - 1
target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dts

@@ -26,7 +26,7 @@
 
 	chosen {
 		stdout-path = &uart0;
-		bootargs = "console=ttyS0,115200n1 loglevel=8 pci=pcie_bus_perf ubi.block=0,fit root=/dev/fit0";
+		bootargs = "console=ttyS0,115200n1 loglevel=8 pci=pcie_bus_perf ubi.block=0,fit root=/dev/fit0 rootwait";
 		rootdisk-spim-nand = <&ubi_rootfs>;
 	};
 

+ 1 - 1
target/linux/mediatek/patches-6.1/164-dts-mt7623-bpi-r2-rootdisk-for-fitblk.patch

@@ -5,7 +5,7 @@
  	chosen {
  		stdout-path = "serial2:115200n8";
 -		bootargs = "earlycon=uart8250,mmio32,0x11004000 console=ttyS2,115200n8 console=tty1";
-+		bootargs = "root=/dev/fit0 earlycon=uart8250,mmio32,0x11004000 console=ttyS2,115200n8 console=tty1";
++		bootargs = "root=/dev/fit0 rootwait earlycon=uart8250,mmio32,0x11004000 console=ttyS2,115200n8 console=tty1";
 +		rootdisk-emmc = <&emmc_rootdisk>;
 +		rootdisk-sd = <&sd_rootdisk>;
  	};