mediatek: wait for fitblk rootfs
authorDaniel Golle <daniel@makrotopia.org>
Sat, 9 Mar 2024 13:48:03 +0000 (13:48 +0000)
committerDaniel Golle <daniel@makrotopia.org>
Sat, 9 Mar 2024 14:02:58 +0000 (14:02 +0000)
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 <daniel@makrotopia.org>
target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts
target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1-ubootmod.dts
target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v2-ubootmod.dts
target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v3-ubootmod.dts
target/linux/mediatek/dts/mt7623a-unielec-u7623-02.dts
target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000-ubootmod.dts
target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dts
target/linux/mediatek/patches-6.1/164-dts-mt7623-bpi-r2-rootdisk-for-fitblk.patch

index e2b7268e8571453029f3a501f0e94fd04e7aac14..88538c8b0a6c4b5dce935a1aa7598317e58f8cf9 100644 (file)
@@ -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";
        };
 };
 
index 5f62ed1a455029c5f2b17304b4510c1ff7b6e744..6e310d40bfeb3c63a196bbe03254f3d95af9aeb9 100644 (file)
@@ -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";
        };
 };
 
index 96effb8aab411784794811cfc7eb8b997513f71d..501e09a690704071a5380d093ca6273e521cba72 100644 (file)
@@ -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";
        };
 };
 
index ec98dd262cfb36e033b3858dd24b0ae5d2fa328c..8c90c734d9ea25e3775f38e73f7512346c85ae4a 100644 (file)
@@ -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";
        };
 };
 
index 75ee0723ece6ca361b73fcb7c326d0dbef735ca5..2dbb98e230383b59097504a57c95cdec7e55d4a7 100644 (file)
@@ -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>;
        };
 };
index a296c768f0974f6e13b6aa4be05a1de7ecae3b36..f26ab1a88e9f290de68e28222285cd5b82560ec8 100644 (file)
@@ -10,6 +10,7 @@
 
 &chosen {
        rootdisk = <&ubi_rootdisk>;
+       bootargs-append = " root=/dev/fit0 rootwait";
 };
 
 &partitions {
index 416958428f3c9cbe54108fab2389990cf221c7fe..f5c0c7ee2f38c9b2273226d0c04846a357d3cd7a 100644 (file)
@@ -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>;
        };
 
index 2675aa2589abd06764c58346099c6354ab90cdb1..f617211c9aa4415c32c1dc07339d0b718ca7304a 100644 (file)
@@ -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>;
        };