[Feature][T8TSK-294][UCI]fix rndis config to lynq_uci_ro config_2.1
Only Configure: No
Affected branch: MR3.0-Merge-v3.0
Affected module: uci,usb
Is it affected on both ZXIC and MTK: only MTK
Self-test: Yes
Doc Update: No
Change-Id: I232f9f795e81335882d78bf451ae8d60d6bbaab0
diff --git a/meta/meta-mediatek-mt2735/recipes-core/initial/files/init_usb b/meta/meta-mediatek-mt2735/recipes-core/initial/files/init_usb
index 3b952e9..eb39a56 100755
--- a/meta/meta-mediatek-mt2735/recipes-core/initial/files/init_usb
+++ b/meta/meta-mediatek-mt2735/recipes-core/initial/files/init_usb
@@ -79,10 +79,9 @@
#setprop sys.usb.config adb,acm
#################### START ####################
sleep 1
- rndis_status=$(uci get lynq_uci.rndis.status)
+ rndis_status=$(uci get lynq_uci_ro.rndis.status)
echo "====rndis status:$rndis_status====" > /dev/kmsg
if [ "$rndis_status" == "1" ]; then
-
echo rndis_acm > /sys/kernel/config/usb_gadget/g1/configs/b.1/strings/0x409/configuration
echo 0x7102 > /sys/kernel/config/usb_gadget/g1/idProduct
echo 0x0001 > /sys/kernel/config/usb_gadget/g1/bcdDevice
@@ -91,15 +90,27 @@
ln -sf /sys/kernel/config/usb_gadget/g1/functions/acm.gs0 /sys/kernel/config/usb_gadget/g1/configs/b.1/f2
ln -sf /sys/kernel/config/usb_gadget/g1/functions/acm.gs1 /sys/kernel/config/usb_gadget/g1/configs/b.1/f3
ln -sf /sys/kernel/config/usb_gadget/g1/functions/acm.gs3 /sys/kernel/config/usb_gadget/g1/configs/b.1/f4
-
else
- echo gs1gs3_dual_acm > /sys/kernel/config/usb_gadget/g1/configs/b.1/strings/0x409/configuration
- echo 0x202f > /sys/kernel/config/usb_gadget/g1/idProduct
- echo 1 > /sys/devices/platform/soc/mt_usb/saving
- ln -sf /sys/kernel/config/usb_gadget/g1/functions/ffs.adb /sys/kernel/config/usb_gadget/g1/configs/b.1/f1
- ln -sf /sys/kernel/config/usb_gadget/g1/functions/acm.gs0 /sys/kernel/config/usb_gadget/g1/configs/b.1/f2
- ln -sf /sys/kernel/config/usb_gadget/g1/functions/acm.gs1 /sys/kernel/config/usb_gadget/g1/configs/b.1/f3
- ln -sf /sys/kernel/config/usb_gadget/g1/functions/acm.gs3 /sys/kernel/config/usb_gadget/g1/configs/b.1/f4
+ rndis_status_1=$(uci get lynq_uci.rndis.status)
+ echo "====rndis_initiate:$rndis_status_1====" > /dev/kmsg
+ if [ "$rndis_status_1" == "1" ]; then
+ echo rndis_acm > /sys/kernel/config/usb_gadget/g1/configs/b.1/strings/0x409/configuration
+ echo 0x7102 > /sys/kernel/config/usb_gadget/g1/idProduct
+ echo 0x0001 > /sys/kernel/config/usb_gadget/g1/bcdDevice
+ echo 1 > /sys/devices/platform/soc/mt_usb/saving
+ ln -sf /sys/kernel/config/usb_gadget/g1/functions/rndis.gs4 /sys/kernel/config/usb_gadget/g1/configs/b.1/f1
+ ln -sf /sys/kernel/config/usb_gadget/g1/functions/acm.gs0 /sys/kernel/config/usb_gadget/g1/configs/b.1/f2
+ ln -sf /sys/kernel/config/usb_gadget/g1/functions/acm.gs1 /sys/kernel/config/usb_gadget/g1/configs/b.1/f3
+ ln -sf /sys/kernel/config/usb_gadget/g1/functions/acm.gs3 /sys/kernel/config/usb_gadget/g1/configs/b.1/f4s
+ else
+ echo gs1gs3_dual_acm > /sys/kernel/config/usb_gadget/g1/configs/b.1/strings/0x409/configuration
+ echo 0x202f > /sys/kernel/config/usb_gadget/g1/idProduct
+ echo 1 > /sys/devices/platform/soc/mt_usb/saving
+ ln -sf /sys/kernel/config/usb_gadget/g1/functions/ffs.adb /sys/kernel/config/usb_gadget/g1/configs/b.1/f1
+ ln -sf /sys/kernel/config/usb_gadget/g1/functions/acm.gs0 /sys/kernel/config/usb_gadget/g1/configs/b.1/f2
+ ln -sf /sys/kernel/config/usb_gadget/g1/functions/acm.gs1 /sys/kernel/config/usb_gadget/g1/configs/b.1/f3
+ ln -sf /sys/kernel/config/usb_gadget/g1/functions/acm.gs3 /sys/kernel/config/usb_gadget/g1/configs/b.1/f4
+ fi
fi
#################### END ####################
sleep 1
diff --git a/meta/meta-mediatek-mt2735/recipes-core/initial/files/lynq_data_recover b/meta/meta-mediatek-mt2735/recipes-core/initial/files/lynq_data_recover
index 10e7592..46a38a6 100755
--- a/meta/meta-mediatek-mt2735/recipes-core/initial/files/lynq_data_recover
+++ b/meta/meta-mediatek-mt2735/recipes-core/initial/files/lynq_data_recover
@@ -186,7 +186,7 @@
rm -rf /etc/config/.*.uci*
rm -rf /home/root/.config/pulse/*
check_uci
-grep "option status '1'" /etc/config/lynq_uci || check_copy_file /data_backup/lynq_uci /etc/config/lynq_uci
+check_copy_file /data_backup/config/lynq_uci_ro /etc/config/lynq_uci_ro
mkdir -p /data/atsvc
check_copy_file /data_backup/lynq_atsvc_plugin.xml /data/atsvc/lynq_atsvc_plugin.xml
check_copy_file /data_backup/terminal_controller.conf /data/atsvc/terminal_controller.conf