domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mediatek: enable rootwait for cmcc rax3000m emmc version

Browse Source 
Sometimes the mmc deivce may come up later than kernel attempts to
mount rootfs, resulting kernel panic. Enable rootwait to fix it.

Reported-by: Yangyu Chen <cyy@cyyself.name>
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Link: https://github.com/openwrt/openwrt/pull/15077
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Tianling Shen
2024-04-05 15:44:24 +08:00
committed by Hauke Mehrtens
parent 6fadcee50b
commit a591f9cd14
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch
View File

@@ -585,7 +585,7 @@
+serverip=192.168.1.254 +serverip=192.168.1.254
+loadaddr=0x46000000 +loadaddr=0x46000000
+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0 +console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
+bootargs=root=/dev/mmcblk0p65 +bootargs=root=/dev/mmcblk0p65 rootwait
+bootcmd=if pstore check ; then run boot_recovery ; else run boot_emmc ; fi +bootcmd=if pstore check ; then run boot_recovery ; else run boot_emmc ; fi
+bootconf=config-1#mt7981b-cmcc-rax3000m-emmc +bootconf=config-1#mt7981b-cmcc-rax3000m-emmc
+bootdelay=0 +bootdelay=0

9
target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc.dtso
View File

@@ -7,6 +7,13 @@
compatible = "cmcc,rax3000m", "mediatek,mt7981"; compatible = "cmcc,rax3000m", "mediatek,mt7981";
fragment@0 { fragment@0 {
target = <&chosen>;
__overlay_ {
bootargs-append = " rootwait";
};
};
fragment@1 {
target = <&mmc0>; target = <&mmc0>;
__overlay__ { __overlay__ {
bus-width = <8>; bus-width = <8>;
@@ -22,7 +29,7 @@
}; };
}; };
fragment@1 { fragment@2 {
target = <&pio>; target = <&pio>;
__overlay__ { __overlay__ {
mmc0_pins_default: mmc0-pins { mmc0_pins_default: mmc0-pins {

2
target/linux/mediatek/dts/mt7981b-cmcc-rax3000m.dts
View File

@@ -21,7 +21,7 @@
serial0 = &uart0; serial0 = &uart0;
}; };
chosen { chosen: chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };