Merge "[Feature][T108][task-view-1591] call start_oemapp.sh script when booting up 1.1" into GSW_V1453
diff --git a/config/defconfig_asr1806p301 b/config/defconfig_asr1806p301
index 6b40269..bdb4983 100755
--- a/config/defconfig_asr1806p301
+++ b/config/defconfig_asr1806p301
@@ -7183,7 +7183,7 @@
CONFIG_PACKAGE_router=y
CONFIG_PACKAGE_stk=y
CONFIG_PACKAGE_tr069=y
-CONFIG_PACKAGE_traffic_stat=y
+# CONFIG_PACKAGE_traffic_stat is not set
# end of service
#
diff --git a/marvell/linux/arch/arm/boot/dts/asr1806-p301.dts b/marvell/linux/arch/arm/boot/dts/asr1806-p301.dts
index 1aba992..f24d3b3 100755
--- a/marvell/linux/arch/arm/boot/dts/asr1806-p301.dts
+++ b/marvell/linux/arch/arm/boot/dts/asr1806-p301.dts
@@ -322,7 +322,10 @@
};
uart2: uart@d4036000 {
pinctrl-names = "default";
- pinctrl-0 = <&gps_pmx_uart_rxd &gps_pmx_uart_txd &gps_pmx_func_cts_rts>;
+
+ //#LYNQ_MODFIY modify for task-1618 2025/6/11 start
+ pinctrl-0 = <&gps_pmx_uart_rxd &gps_pmx_uart_txd>; //&gps_pmx_func_cts_rts>;
+ //#LYNQ_MODFIY modify for task-1618 2025/6/11 end
status = "okay";
};
uart3: uart@d4018000 {
@@ -478,7 +481,10 @@
/* gps dedicated uart */
pinctrl-single,pins = <
GPIO51 AF1
- GPIO32 AF1
+
+ //#LYNQ_MODFIY modify for task-1618 2025/6/11 start
+ /*GPIO32 AF1*/
+ //#LYNQ_MODFIY modify for task-1618 2025/6/11 end
>;
DS_MEDIUM;PULL_NONE;EDGE_NONE;SL_NORMAL;
};
@@ -486,7 +492,9 @@
/* gps dedicated uart */
pinctrl-single,pins = <
GPIO52 AF1
- GPIO31 AF1
+ //#LYNQ_MODFIY modify for task-1618 2025/6/11 start
+ /*GPIO31 AF1*/
+ //#LYNQ_MODFIY modify for task-1618 2025/6/11 end
>;
DS_MEDIUM;PULL_NONE;EDGE_NONE;SL_NORMAL;
};
diff --git a/marvell/lte-telephony/apps/atcmd_server_ss/src/telcontroller.c b/marvell/lte-telephony/apps/atcmd_server_ss/src/telcontroller.c
index d2e7bde..0a3f9af 100755
--- a/marvell/lte-telephony/apps/atcmd_server_ss/src/telcontroller.c
+++ b/marvell/lte-telephony/apps/atcmd_server_ss/src/telcontroller.c
@@ -4596,7 +4596,8 @@
DEFINE_SIM1_NO_INDICATION_CHANEL_DESC(TEL_SOCKET_AT_CMD_ATP_BEGIN, "atcmdni1", FALSE),
DEFINE_MASTER_SIM_CHANEL_DESC(TEL_SOCKET_AT_CMD_ATP_BEGIN, "atcmdm", FALSE),
#ifndef BIONIC /* No DSDS in NZ3*/
- DEFINE_MASTER_SIM_CHANEL_DESC(TEL_SOCKET_AT_CMD_ATP_BEGIN, "atcmdmni", FALSE),
+ //DEFINE_MASTER_SIM_CHANEL_DESC(TEL_SOCKET_AT_CMD_ATP_BEGIN, "atcmdmni", FALSE),
+ DEFINE_MASTER_SIM_NO_INDICATION_CHANEL_DESC(TEL_SOCKET_AT_CMD_ATP_BEGIN, "atcmdmni", FALSE),
#else
DEFINE_MASTER_SIM_NO_INDICATION_CHANEL_DESC(TEL_SOCKET_AT_CMD_ATP_BEGIN, "atcmdmni", FALSE),
#endif /* BIONIC */
diff --git a/mbtk/libgsw_lib/gsw_at_interface.c b/mbtk/libgsw_lib/gsw_at_interface.c
index cbf2c21..67a61a1 100755
--- a/mbtk/libgsw_lib/gsw_at_interface.c
+++ b/mbtk/libgsw_lib/gsw_at_interface.c
@@ -342,27 +342,40 @@
int gsw_get_modem_temperture(ZONE_NUM num,int *temp)
{
- if (num == soc_max)
+ if (num != soc_max)
{
- char *cmd = "/sys/class/thermal/thermal_zone0/temp";
- FILE *fp;
- char buf[128];
- fp = fopen(cmd, "r");
- if (fp == NULL)
- {
- perror("Unable to open file");
- return GSW_HAL_NORMAL_FAIL;
- }
-
- if (fgets(buf, sizeof(buf), fp) != NULL)
- {
- *temp = atoi(buf) * 0.001;
- //printf("Temperature: %d °C\n", *temp);
- }
-
- fclose(fp);
- return GSW_HAL_SUCCESS;
+ LOGE("temperture if not support,num is %d\n",num);
+ return GSW_HAL_FUNC_UNSUPPORT;
}
- else
- return GSW_HAL_FUNC_UNSUPPORT;
+ if (NULL == temp)
+ {
+ LOGE("temperture is null\n");
+ return GSW_HAL_ARG_INVALID;
+ }
+
+ char *cmd = "/sys/class/thermal/thermal_zone0/temp";
+ FILE *fp = NULL;
+ char buf[128] = {0};
+ fp = fopen(cmd, "r");
+ if (fp == NULL)
+ {
+ LOGE("Unable to open file");
+ return GSW_HAL_NORMAL_FAIL;
+ }
+ if (fgets(buf, sizeof(buf), fp) == NULL)
+ {
+ LOGE("fgets fail");
+ fclose(fp);
+ return GSW_HAL_NORMAL_FAIL;
+ }
+ if (strlen(buf) == 0)
+ {
+ LOGE("read len == 0\n");
+ fclose(fp);
+ return GSW_HAL_NORMAL_FAIL;
+ }
+
+ *temp = atoi(buf) / 1000;
+ fclose(fp);
+ return GSW_HAL_SUCCESS;
}
diff --git a/mbtk/mbtk_version b/mbtk/mbtk_version
index 4195991..f1fe798 100755
--- a/mbtk/mbtk_version
+++ b/mbtk/mbtk_version
@@ -1,3 +1,3 @@
-PATCH_INDEX=1
+PATCH_INDEX=2
GIT_COMMIT=be5ef44399ae1d36692f7cdc06e31fe98b36a346
PATCH_DATE=2025-03-05_16:31:55
diff --git a/mbtk/rootfs/etc/mbtk_wifi.sh b/mbtk/rootfs/etc/mbtk_wifi.sh
index 322635f..562ce1d 100755
--- a/mbtk/rootfs/etc/mbtk_wifi.sh
+++ b/mbtk/rootfs/etc/mbtk_wifi.sh
@@ -108,7 +108,7 @@
#brctl addif br-lan wlan0
add_wlan0_to_bridge
- iptables -t nat -A POSTROUTING -o ccinet0 -j MASQUERADE --random
+ #iptables -t nat -A POSTROUTING -o ccinet0 -j MASQUERADE --random
}
function wifi_ap_stop()
@@ -187,4 +187,4 @@
esac
else
help
-fi
\ No newline at end of file
+fi
diff --git a/target/linux/mmp/base-files/etc/config/network b/target/linux/mmp/base-files/etc/config/network
index ac18a9a..d7f1c82 100755
--- a/target/linux/mmp/base-files/etc/config/network
+++ b/target/linux/mmp/base-files/etc/config/network
@@ -186,3 +186,7 @@
config interface wlan6
option proto none
+config interface 'autowan'
+ option ifname 'eth0'
+ option proto 'none'
+ option mtu '1500'