[Feature][T8TSK-289] fix bad link of bl2 bl33 partition & keep kernel
log print to uart before mount log
Only Configure: No
Affected branch: MR3.0-Merge-v2.0-ZK
Affected module:
Is it affected on both ZXIC and MTK: only MTK
Self-test: No
Doc Update: No
Change-Id: I2c6ecce8971fa9f62d5ecc3fe61a6b6ae76f32d9
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/files/init_mount_nand b/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/files/init_mount_nand
index 5693414..128715e 100755
--- a/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/files/init_mount_nand
+++ b/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/files/init_mount_nand
@@ -136,7 +136,12 @@
init_log() {
#you.chen@2023-09-27 add for console log level
- cat /proc/cmdline | grep " loglevel=0 " > /dev/null && setconsole /dev/tty30
+ cat /proc/cmdline | grep " loglevel=7 " > /dev/null
+ if [ $? -ne 0 ]; then
+ echo 0 > /proc/sys/kernel/printk
+ setconsole /dev/tty30
+ fi
+
mnt_folder log /log
if [ -e /dev/mmcblk1p1 ]; then
if [ ! -e /run/media/mmcblk1p1 ]; then
@@ -237,9 +242,9 @@
ln -s ../../mtd37 vbmeta_b
ln -s ../../mtd39 expdb
ln -s ../../mtd0 bl2_a
- ln -s ../../mtd40 bl2_b
+ ln -s ../../mtd41 bl2_b
ln -s ../../mtd1 bl33_a
- ln -s ../../mtd41 bl33_b
+ ln -s ../../mtd42 bl33_b
ln -s ../../mtd29 mcupm_a
ln -s ../../mtd44 mcupm_b
ln -s ../../mtd30 sspm_a
diff --git a/meta/meta-mediatek-mt2735/recipes-core/initial/files/init_mount_nand b/meta/meta-mediatek-mt2735/recipes-core/initial/files/init_mount_nand
index 5693414..128715e 100755
--- a/meta/meta-mediatek-mt2735/recipes-core/initial/files/init_mount_nand
+++ b/meta/meta-mediatek-mt2735/recipes-core/initial/files/init_mount_nand
@@ -136,7 +136,12 @@
init_log() {
#you.chen@2023-09-27 add for console log level
- cat /proc/cmdline | grep " loglevel=0 " > /dev/null && setconsole /dev/tty30
+ cat /proc/cmdline | grep " loglevel=7 " > /dev/null
+ if [ $? -ne 0 ]; then
+ echo 0 > /proc/sys/kernel/printk
+ setconsole /dev/tty30
+ fi
+
mnt_folder log /log
if [ -e /dev/mmcblk1p1 ]; then
if [ ! -e /run/media/mmcblk1p1 ]; then
@@ -237,9 +242,9 @@
ln -s ../../mtd37 vbmeta_b
ln -s ../../mtd39 expdb
ln -s ../../mtd0 bl2_a
- ln -s ../../mtd40 bl2_b
+ ln -s ../../mtd41 bl2_b
ln -s ../../mtd1 bl33_a
- ln -s ../../mtd41 bl33_b
+ ln -s ../../mtd42 bl33_b
ln -s ../../mtd29 mcupm_a
ln -s ../../mtd44 mcupm_b
ln -s ../../mtd30 sspm_a
diff --git a/src/kernel/linux/v4.19/arch/arm64/boot/dts/mediatek/auto2735evb.dts b/src/kernel/linux/v4.19/arch/arm64/boot/dts/mediatek/auto2735evb.dts
index cbf3371..50a8a96 100755
--- a/src/kernel/linux/v4.19/arch/arm64/boot/dts/mediatek/auto2735evb.dts
+++ b/src/kernel/linux/v4.19/arch/arm64/boot/dts/mediatek/auto2735evb.dts
@@ -40,7 +40,7 @@
ubi.mtd=27,0,1 ubi.mtd=20,0,1 ubi.mtd=22,0,1 \
rootwait \
androidboot.selinux=permissive androidboot.hardware=mt6890 \
- initcall_debug=1 page_owner=on loglevel=0 systemd.default_standard_output=kmsg";
+ initcall_debug=1 page_owner=on loglevel=6 systemd.default_standard_output=kmsg";
atag,videolfb-fb_base_l = <0x7e605000>;
atag,videolfb-fb_base_h = <0x0>;