Merge "[Bugfix][API-1134][wifi]fix when sta first connect ap, upper applicat get hostname more than 3 sec" into GSW3.0-No-Connman
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 159e628..4286ff4 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
@@ -39,36 +39,16 @@
mntdone=`mount -t ubifs /dev/ubi6_0 $MNT_FOLDER 2>&1`
echo "mount: mount oemdata"
elif [ $BLK_NAME == "oemapp_a" ]; then
- cat /proc/mtd | grep "oemapp_a" | grep "mtd49"
- if [ $? -eq 0 ]; then
- mntdone=`mount -t squashfs /dev/mtdblock49 $MNT_FOLDER 2>&1`
- else
- mntdone=`mount -t squashfs /dev/mtdblock43 $MNT_FOLDER 2>&1`
- fi
+ mntdone=`mount -t squashfs /dev/mtdblock49 $MNT_FOLDER 2>&1`
echo "mount: mount oemapp"
elif [ $BLK_NAME == "oemapp_b" ]; then
- cat /proc/mtd | grep "oemapp_b" | grep "mtd50"
- if [ $? -eq 0 ]; then
- mntdone=`mount -t squashfs /dev/mtdblock50 $MNT_FOLDER 2>&1`
- else
- mntdone=`mount -t squashfs /dev/mtdblock44 $MNT_FOLDER 2>&1`
- fi
+ mntdone=`mount -t squashfs /dev/mtdblock50 $MNT_FOLDER 2>&1`
echo "mount: mount oemapp"
elif [ $BLK_NAME == "oemapp2_a" ]; then
- cat /proc/mtd | grep "oemapp2_a" | grep "mtd47"
- if [ $? -eq 0 ]; then
- mntdone=`mount -t squashfs /dev/mtdblock47 $MNT_FOLDER 2>&1`
- else
- mntdone=`mount -t squashfs /dev/mtdblock41 $MNT_FOLDER 2>&1`
- fi
+ mntdone=`mount -t squashfs /dev/mtdblock47 $MNT_FOLDER 2>&1`
echo "mount: mount oemapp2"
elif [ $BLK_NAME == "oemapp2_b" ]; then
- cat /proc/mtd | grep "oemapp2_b" | grep "mtd48"
- if [ $? -eq 0 ]; then
- mntdone=`mount -t squashfs /dev/mtdblock48 $MNT_FOLDER 2>&1`
- else
- mntdone=`mount -t squashfs /dev/mtdblock42 $MNT_FOLDER 2>&1`
- fi
+ mntdone=`mount -t squashfs /dev/mtdblock48 $MNT_FOLDER 2>&1`
echo "mount: mount oemapp2"
#you.chen@2022-07-11 add for load oemapp end
fi
@@ -225,75 +205,44 @@
mkdir -p /dev/disk/by-partlabel
if [ -d "/dev/disk/by-partlabel" ]; then
cd /dev/disk/by-partlabel
- cat /proc/mtd | grep "bl2_a"
- if [ $? -eq 0 ]; then
- ln -s ../../mtd6 hsm_bl
- ln -s ../../mtd7 hsm_os_a
- ln -s ../../mtd42 hsm_os_b
- ln -s ../../mtd8 boot_para
- ln -s ../../mtd9 protect_a
- ln -s ../../mtd10 protect_b
- ln -s ../../mtd12 boot_a
- ln -s ../../mtd13 boot_b
- ln -s ../../mtd14 system_a
- ln -s ../../mtd15 system_b
- ln -s ../../mtd16 md1img_a
- ln -s ../../mtd17 md1img_b
- ln -s ../../mtd18 md1dsp_a
- ln -s ../../mtd19 md1dsp_b
- ln -s ../../mtd20 mcf1_a
- ln -s ../../mtd21 mcf1_b
- ln -s ../../mtd22 mcf2_a
- ln -s ../../mtd23 mcf2_b
- ln -s ../../mtd24 misc
- ln -s ../../mtd25 tee_a
- ln -s ../../mtd26 tee_b
- ln -s ../../mtd36 vbmeta_a
- ln -s ../../mtd37 vbmeta_b
- ln -s ../../mtd39 expdb
- ln -s ../../mtd0 bl2_a
- ln -s ../../mtd40 bl2_b
- ln -s ../../mtd1 bl33_a
- ln -s ../../mtd41 bl33_b
- ln -s ../../mtd29 mcupm_a
- ln -s ../../mtd43 mcupm_b
- ln -s ../../mtd30 sspm_a
- ln -s ../../mtd44 sspm_b
- ln -s ../../mtd31 dpm_a
- ln -s ../../mtd45 dpm_b
- ln -s ../../mtd47 oemapp2_a
- ln -s ../../mtd48 oemapp2_b
- ln -s ../../mtd49 oemapp_a
- ln -s ../../mtd50 oemapp_b
- else
- ln -s ../../mtd6 hsm_bl
- ln -s ../../mtd7 hsm_os
- ln -s ../../mtd8 boot_para
- ln -s ../../mtd9 protect_a
- ln -s ../../mtd10 protect_b
- ln -s ../../mtd12 boot_a
- ln -s ../../mtd13 boot_b
- ln -s ../../mtd14 system_a
- ln -s ../../mtd15 system_b
- ln -s ../../mtd16 md1img_a
- ln -s ../../mtd17 md1img_b
- ln -s ../../mtd18 md1dsp_a
- ln -s ../../mtd19 md1dsp_b
- ln -s ../../mtd20 mcf1_a
- ln -s ../../mtd21 mcf1_b
- ln -s ../../mtd22 mcf2_a
- ln -s ../../mtd23 mcf2_b
- ln -s ../../mtd24 misc
- ln -s ../../mtd25 tee_a
- ln -s ../../mtd26 tee_b
- ln -s ../../mtd36 vbmeta_a
- ln -s ../../mtd37 vbmeta_b
- ln -s ../../mtd39 expdb
- ln -s ../../mtd41 oemapp2_a
- ln -s ../../mtd42 oemapp2_b
- ln -s ../../mtd43 oemapp_a
- ln -s ../../mtd44 oemapp_b
- fi
+ ln -s ../../mtd6 hsm_bl
+ ln -s ../../mtd7 hsm_os_a
+ ln -s ../../mtd42 hsm_os_b
+ ln -s ../../mtd8 boot_para
+ ln -s ../../mtd9 protect_a
+ ln -s ../../mtd10 protect_b
+ ln -s ../../mtd12 boot_a
+ ln -s ../../mtd13 boot_b
+ ln -s ../../mtd14 system_a
+ ln -s ../../mtd15 system_b
+ ln -s ../../mtd16 md1img_a
+ ln -s ../../mtd17 md1img_b
+ ln -s ../../mtd18 md1dsp_a
+ ln -s ../../mtd19 md1dsp_b
+ ln -s ../../mtd20 mcf1_a
+ ln -s ../../mtd21 mcf1_b
+ ln -s ../../mtd22 mcf2_a
+ ln -s ../../mtd23 mcf2_b
+ ln -s ../../mtd24 misc
+ ln -s ../../mtd25 tee_a
+ ln -s ../../mtd26 tee_b
+ ln -s ../../mtd36 vbmeta_a
+ ln -s ../../mtd37 vbmeta_b
+ ln -s ../../mtd39 expdb
+ ln -s ../../mtd0 bl2_a
+ ln -s ../../mtd40 bl2_b
+ ln -s ../../mtd1 bl33_a
+ ln -s ../../mtd41 bl33_b
+ ln -s ../../mtd29 mcupm_a
+ ln -s ../../mtd43 mcupm_b
+ ln -s ../../mtd30 sspm_a
+ ln -s ../../mtd44 sspm_b
+ ln -s ../../mtd31 dpm_a
+ ln -s ../../mtd45 dpm_b
+ ln -s ../../mtd47 oemapp2_a
+ ln -s ../../mtd48 oemapp2_b
+ ln -s ../../mtd49 oemapp_a
+ ln -s ../../mtd50 oemapp_b
fi
mount -t tmpfs /dev/disk/by-partlabel/misc /misc