[Feature][T8TSK-294][UCI]fix rndis config to lynq_uci_ro config_2
Only Configure: No
Affected branch: MR3.0-Merge-v3.0
Affected module: uci
Is it affected on both ZXIC and MTK: only MTK
Self-test: Yes
Doc Update: No
Change-Id: I0a5af0cbc66c1d6583aee0d5ad3bdaea5952d855
diff --git a/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb b/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb
index ceeaef3..bb28d2d 100755
--- a/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb
+++ b/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb
@@ -233,7 +233,7 @@
SOURCE=${TOPDIR}/tmp/deploy/images/auto2735evb-ivt-main/state
TARGET=${TOPDIR}/tmp/work/auto2735evb_ivt_main-poky-linux/mtk-image-2735/1.0-r0/rootfs
mkdir ${TARGET}/data_backup
- cp ${TARGET}/etc/config/radio_property ${TARGET}/data_backup/
+ cp -r ${TARGET}/etc/config/ ${TARGET}/data_backup/
cp ${TARGET}/data/atsvc/lynq_atsvc_plugin.xml ${TARGET}/data_backup/
cp ${TARGET}/data/atsvc/terminal_controller.conf ${TARGET}/data_backup/
cd ${SOURCE}
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..efe41e5 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,36 @@
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_initiate====" > /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
+ rndis_initiate=$(uci get lynq_uci.lynq_rndis.initiate)
+ echo "====rndis_initiate:$rndis_initiate====" > /dev/kmsg
+ if [ "$rndis_initiate" == "1" ]; then
+ echo rndis > /sys/kernel/config/usb_gadget/g1/configs/b.1/strings/0x409/configuration
+ echo 0x2028 > /sys/kernel/config/usb_gadget/g1/idProduct
+ echo 1 > /sys/devices/platform/soc/mt_usb/saving
+ l n -sf /sys/kernel/config/usb_gadget/g1/functions/rndis.gs4 /sys/kernel/config/usb_gadget/g1/configs/b.1/f1
+ 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
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 ea79d84..ec6da90 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
@@ -128,13 +128,48 @@
echo "$FIND_STR4" >> "$FIND_FILE"
fi
}
+#jb.qi@2024.3.15 add for uci check start
+check_uci()
+{
+ uci get lynq_uci.lynq_ril > /dev/null
+ if [ $? -ne 0 ]; then
+ echo "$TAG: lynq_uci config cant get" > /dev/kmsg
+ cp /data_backup/config/lynq_uci /etc/config/lynq_uci
+ fi
+
+ uci get mdlog.property > /dev/null
+ if [ $? -ne 0 ]; then
+ echo "$TAG: mdlog config cant get" > /dev/kmsg
+ cp /data_backup/config/mdlog /etc/config/mdlog
+ fi
+
+ uci get radio_property.property > /dev/null
+ if [ $? -ne 0 ]; then
+ echo "$TAG: radio_property config cant get" > /dev/kmsg
+ cp /data_backup/config/radio_property /etc/config/radio_property
+ fi
+
+ uci get service.tcp > /dev/null
+ if [ $? -ne 0 ]; then
+ echo "$TAG: service config cant get" > /dev/kmsg
+ cp /data_backup/config/service /etc/config/service
+ fi
+
+ uci get usb.config > /dev/null
+ if [ $? -ne 0 ]; then
+ echo "$TAG: usb config cant get" > /dev/kmsg
+ cp /data_backup/config/usb /etc/config/usb
+ fi
+}
+#jb.qi@2024.3.15 add for uci check end
+
cd /
#recover some files start
echo "$TAG: Before recover radio_property" > /dev/kmsg
rm -rf /etc/config/.*.uci*
-check_copy_file /data_backup/radio_property /etc/config/radio_property
-check_copy_file /data_backup/lynq_uci /etc/config/lynq_uci
+check_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
diff --git a/update_version.sh b/update_version.sh
old mode 100644
new mode 100755
index b54ca69..d3989d8
--- a/update_version.sh
+++ b/update_version.sh
@@ -1,10 +1,15 @@
#!/bin/bash
+SW_INSIDE_VERSION="T800_v02.MP1_MR3.03b00.00.02"
+SW_VERSION="T800_v02.MP1_MR3.03b00.00.02"
-LYNQ_SW_INSIDE_VERSION="LYNQ_CONFIG_VERSION = \"T800_v02.MP1_MR3.03b00.00.02\""
-LYNQ_SW_VERSION="LYNQ_CONFIG_SW_VERSION = \"T800_v02.MP1_MR3.03b00.00.02\""
+LYNQ_SW_INSIDE_VERSION="LYNQ_CONFIG_VERSION = \"${SW_INSIDE_VERSION}\""
+LYNQ_SW_VERSION="LYNQ_CONFIG_SW_VERSION = \"${SW_VERSION}\""
COMMIT_ID="$(git rev-parse --short HEAD)"
LYNQ_COMMITID="LYNQ_CONFIG_COMMITID = \"${COMMIT_ID}\""
+LYNQ_VERSION_UCI=" option LYNQ_SW_VERSION '${SW_VERSION}'"
+LYNQ_INSIDE_VERSION_UCI=" option LYNQ_SW_INSIDE_VERSION '${SW_INSIDE_VERSION}'"
+
eval sed -i 's/^.*LYNQ_CONFIG_VERSION.*$/"${LYNQ_SW_INSIDE_VERSION}"/' $(pwd)/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
eval sed -i 's/^.*LYNQ_CONFIG_SW_VERSION.*$/"${LYNQ_SW_VERSION}"/' $(pwd)/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
eval sed -i 's/^.*LYNQ_CONFIG_COMMITID.*$/"${LYNQ_COMMITID}"/' $(pwd)/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
@@ -13,3 +18,9 @@
eval sed -i 's/^.*LYNQ_CONFIG_SW_VERSION.*$/"${LYNQ_SW_VERSION}"/' $(pwd)/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf
eval sed -i 's/^.*LYNQ_CONFIG_COMMITID.*$/"${LYNQ_COMMITID}"/' $(pwd)/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf
+eval sed -i 's/^.*LYNQ_SW_VERSION.*$/"${LYNQ_VERSION_UCI}"/' $(pwd)/LYNQ_PUBLIC/common_src/lib/liblynq-uci/lynq_uci_ro.config
+eval sed -i 's/^.*LYNQ_SW_INSIDE_VERSION.*$/"${LYNQ_INSIDE_VERSION_UCI}"/' $(pwd)/LYNQ_PUBLIC/common_src/lib/liblynq-uci/lynq_uci_ro.config
+
+if [ "$1" = "rndis" ];then
+ sed -i "s/option\\ status\\ '0'/option\\ status\\ '1'/" $(pwd)/LYNQ_PUBLIC/common_src/lib/liblynq-uci/lynq_uci_ro.config
+fi