Merge branch 'main' into fix_simplify_speedup

tmolteno · Dec 21, 2022 · 7c5b446 · 7c5b446
2 parents aacd421 + a77903b
commit 7c5b446
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/config/bootscr_lichee_rv_86.txt b/config/bootscr_lichee_rv_86.txt
@@ -1,6 +1,6 @@
 echo "Loading kernel from mmc 0:1 to address ${kernel_addr_r}"
 load mmc 0:1 ${kernel_addr_r} Image.gz
-setenv bootargs "earlycon=sbi console=ttyS0,115200n8 root=/dev/mmcblk0p2 cma=96M"
+setenv bootargs "earlycon=sbi console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait cma=96M"
 setenv kernel_comp_addr_r 0x44000000
 setenv kernel_comp_size 0xb000000
 echo "Booting kernel with bootargs as $bootargs; and fdtcontroladdr is $fdtcontroladdr"

diff --git a/config/bootscr_lichee_rv_dock.txt b/config/bootscr_lichee_rv_dock.txt
@@ -1,6 +1,6 @@
 echo "Loading kernel from mmc 0:1 to address ${kernel_addr_r}"
 load mmc 0:1 ${kernel_addr_r} Image.gz
-setenv bootargs "earlycon=sbi console=ttyS0,115200n8 root=/dev/mmcblk0p2 cma=96M"
+setenv bootargs "earlycon=sbi console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait cma=96M"
 setenv kernel_comp_addr_r 0x44000000
 setenv kernel_comp_size 0xb000000
 echo "Booting kernel with bootargs as $bootargs; and fdtcontroladdr is $fdtcontroladdr"