[Feature][T8TSK-212][Modem]Update MTK modem version to MOBILETEK35_IVT_T800_MOLY.NR15.R3.MD700.MP.V75.P6
Only Configure:No
Affected branch:T800_MD
Affected module:Modem
Is it affected on both ZXIC and MTK:only MTK
Self-test:Yes
Doc Update:No
Change-Id: Id19a67bd78c05e3f07b27b5943045cc78cb5c24d
diff --git a/mcu/make/common/rel/REL_CR_BASIC.mak b/mcu/make/common/rel/REL_CR_BASIC.mak
index 87ec06e..7d43fb5 100755
--- a/mcu/make/common/rel/REL_CR_BASIC.mak
+++ b/mcu/make/common/rel/REL_CR_BASIC.mak
@@ -327,6 +327,7 @@
CUS_REL_BASE_COMP += interface/service/icd
CUS_REL_BASE_COMP += interface/service/asn1_common
CUS_REL_BASE_COMP += interface/service/config
+CUS_REL_BASE_COMP += interface/service/dhcp
CUS_REL_BASE_COMP += interface/service/dhl/v1
CUS_REL_BASE_COMP += interface/service/dhl/v2
CUS_REL_BASE_COMP += interface/service/em
diff --git a/mcu/make/common/rel/REL_CR_LIB.mak b/mcu/make/common/rel/REL_CR_LIB.mak
index 3224701..2923491 100755
--- a/mcu/make/common/rel/REL_CR_LIB.mak
+++ b/mcu/make/common/rel/REL_CR_LIB.mak
@@ -82,6 +82,7 @@
REL_MTK_COMP_CR_LIB += dem
REL_MTK_COMP_CR_LIB += devdrv_fakeapi
REL_MTK_COMP_CR_LIB += devdrv_sec
+REL_MTK_COMP_CR_LIB += dhcp
REL_MTK_COMP_CR_LIB += dhl
REL_MTK_COMP_CR_LIB += dhl_ext
REL_MTK_COMP_CR_LIB += dhl_sub
diff --git a/mcu/make/common/rule_def/commincdirs_def.mak b/mcu/make/common/rule_def/commincdirs_def.mak
index 5e5d6f4..0ef0e2b 100755
--- a/mcu/make/common/rule_def/commincdirs_def.mak
+++ b/mcu/make/common/rule_def/commincdirs_def.mak
@@ -309,6 +309,13 @@
COMMINCDIRS += interface/driver/hif/hif_sdiodev
COMMINCDIRS += interface/driver/hif/hif_cldmadev
COMMINCDIRS += interface/service/maif
+
+ifdef DHCP_SUPPORT
+ ifeq ($(strip $(DHCP_SUPPORT)),TRUE)
+ COMMINCDIRS += interface/service/dhcp
+ endif
+endif
+
# *************************************************************************
# Build folder
# *************************************************************************
diff --git a/mcu/make/common/rule_def/common_def.mak b/mcu/make/common/rule_def/common_def.mak
index 817e07d..136d69c 100755
--- a/mcu/make/common/rule_def/common_def.mak
+++ b/mcu/make/common/rule_def/common_def.mak
@@ -357,6 +357,8 @@
ifneq ($(filter MT6880 MT6890 MT2735,$(strip $(PLATFORM))),)
COM_DEFS += CHIP10992
+ COM_DEFS += __GEMINI_CALL_PREFER__
+ COM_DEFS += __SAT_AP_NOT_SUPPORT__
endif
ifeq ($(strip $(MTK_MODEM_ARCH)), MT6297P)
@@ -2626,6 +2628,12 @@
endif
endif
+ifdef DHCP_SUPPORT
+ ifeq ($(strip $(DHCP_SUPPORT)),TRUE)
+ COM_DEFS += __DHCP_SUPPORT__
+ endif
+endif
+
# end of defined by rules
# *************************************************************************
# if not BASIC load
diff --git a/mcu/make/common/rule_def/complist_def.mak b/mcu/make/common/rule_def/complist_def.mak
index df7fe58..1d69b25 100755
--- a/mcu/make/common/rule_def/complist_def.mak
+++ b/mcu/make/common/rule_def/complist_def.mak
@@ -205,6 +205,10 @@
endif
endif
+ifeq ($(strip $(DHCP_SUPPORT)),TRUE)
+ COMPLIST += dhcp
+endif
+
ifeq ($(strip $(SUBMARINE_SUPPORT)),TRUE)
COMPLIST += con10
COMPLIST += wlc
diff --git a/mcu/make/common/rule_def/trace_def.mak b/mcu/make/common/rule_def/trace_def.mak
index 7af0ddf..4113b69 100755
--- a/mcu/make/common/rule_def/trace_def.mak
+++ b/mcu/make/common/rule_def/trace_def.mak
@@ -113,6 +113,10 @@
COMP_TRACE_DEFS_MODEM += service/nal/rsra/inc/rsra_trc_mod_rsra_utmd.json
endif
+ifeq ($(strip $(DHCP_SUPPORT)),TRUE)
+COMP_TRACE_DEFS_MODEM += service/dhcp/inc/dhcp_trc_mod_dhcp_utmd.json
+endif
+
ifeq ($(strip $(DHL_SUPPORT)),TRUE)
ifneq ($(filter __DHL_V2_ENABLE__,$(COM_DEFS)),) # DHL2.0
COMP_TRACE_DEFS_MODEM += service/dhl/v2/local_inc/dhl_trace_def_mod_dhl_reader_utmd.json service/dhl/v2/local_inc/dhl_trace_def_mod_dhl_utmd.json service/pmc/local_inc/icd_trace_def_mod_icd_utmd.json service/dhl/v2/local_inc/dhl_trace_def_mod_dhl_ut_utmd.json
diff --git "a/mcu/make/projects/MOBILETEK35_IVT_T800\050NLWG_WIDE_TEMP_CUSTOM\051.mak" "b/mcu/make/projects/MOBILETEK35_IVT_T800\050NLWG_WIDE_TEMP_CUSTOM\051.mak"
index 2177577..144f74d 100755
--- "a/mcu/make/projects/MOBILETEK35_IVT_T800\050NLWG_WIDE_TEMP_CUSTOM\051.mak"
+++ "b/mcu/make/projects/MOBILETEK35_IVT_T800\050NLWG_WIDE_TEMP_CUSTOM\051.mak"
@@ -33,14 +33,13 @@
#
# *************************************************************************
-# Generated at 2022-11-23 14:38:44
+# Generated at 2023-08-21 10:30:32
AES256_SUPPORT = FALSE
# Description:
# use aes256 to encrypt/decrypt
# Option Values:
- # FALSE: don't use aes 256 to encrypt/decrypt
- # TRUE: use aes 256 to encrypt/decrypt
+ # N/A
# Switch-ability:
# Switchable
@@ -101,6 +100,7 @@
# CCB: Specify to AP through Cross Core Buffer.
# CUSTOM_CONFIG: Config in dhl_ext_setting.c by customer.
# MD_PCIE: Specify PCIE Logging Port for MD ONLY load.
+ # MD_SDIO: Specify SDIO Logging Port for MD ONLY load.
# MD_UART: Specify UART Logging Port for MD ONLY load.
# MD_USB: Specify USB Logging Port for MD ONLY load.
# SIM: Specify Simulator Channel.
@@ -123,6 +123,7 @@
# CCB: Specify to AP through Cross Core Buffer.
# CUSTOM_CONFIG: Config in dhl_ext_setting.c by customer.
# MD_PCIE: Specify PCIE Logging Port for MD ONLY load.
+ # MD_SDIO: Specify SDIO Logging Port for MD ONLY load.
# MD_UART: Specify UART Logging Port for MD ONLY load.
# MD_USB: Specify USB Logging Port for MD ONLY load.
# SIM: Specify Simulator Channel.
@@ -240,7 +241,7 @@
NVM_GLOBAL_CABC = FALSE
# Description:
- # Global SKU CA band customization for Colgin
+ # Customize supported band/CA according to PLMN.
# Option Values:
# FALSE: feature disable
# TRUE: feature enable
@@ -432,6 +433,7 @@
# RVCT or ADS
# Option Values:
# ADS: Use ARM ADS tool chain.
+ # CLANG: use CLANG tool chain
# GCC: Use GNU GCC tool chain (Mentor Sourcery 2010.09 , 4.5.1)
# RVCT: Use ARM RVCT tool chain
# Switch-ability:
@@ -450,8 +452,7 @@
# Description:
# Option to choose between MIPS32 and MIPS16 compiler ISA.
# Option Values:
- # MIPS16: Use MIPS16 ISA
- # MIPS32: Use MIPS32 ISA (default)
+ # N/A
# Switch-ability:
# Non-switchable
@@ -520,7 +521,7 @@
EDGE_CLASS_10 = FALSE
# Description:
- # This is for AT&T requirement that Handset can only have multislot class 10. However our default setting is multielost class 12. So we need this feature option to let customer open this feature if they want to pass AT&T cases
+ # This is for OP07 requirement that Handset can only have multislot class 10. However our default setting is multielost class 12. So we need this feature option to let customer open this feature if they want to pass OP07 cases
# Option Values:
# FALSE: GPRS Multislot Class 12
# TRUE: GPRS Multislot Class 10
@@ -549,12 +550,7 @@
# Description:
# Define the HSUPA category in makefile. However, the actual category UE uses is the minimum of this one and the one queried from HW
# Option Values:
- # 1: EDCH category = 1
- # 2: EDCH category = 2
- # 3: EDCH category = 3
- # 4: EDCH category = 4
- # 5: EDCH category = 5
- # 6: EDCH category = 6
+ # N/A
# Switch-ability:
# Non-switchable
@@ -562,18 +558,7 @@
# Description:
# Define the HSDPA category in makefile. However, the actual category UE uses is the minimum of this one and the one queried from HW
# Option Values:
- # 1: HSDSCH category = 1
- # 10: HSDSCH category = 10
- # 11: HSDSCH category = 11
- # 12: HSDSCH category = 12
- # 2: HSDSCH category = 2
- # 3: HSDSCH category = 3
- # 4: HSDSCH category = 4
- # 5: HSDSCH category = 5
- # 6: HSDSCH category = 6
- # 7: HSDSCH category = 7
- # 8: HSDSCH category = 8
- # 9: HSDSCH category = 9
+ # N/A
# Switch-ability:
# Non-switchable
@@ -606,7 +591,7 @@
GPRS_CLASS_10 = FALSE
# Description:
- # This is for AT&T requirement that Handset can only have multislot class 10. However our default setting is multielost class 12. So we need this feature option to let customer open this feature if they want to pass AT&T cases
+ # This is for OP07 requirement that Handset can only have multislot class 10. However our default setting is multielost class 12. So we need this feature option to let customer open this feature if they want to pass OP07 cases
# Option Values:
# FALSE: GPRS Multislot Class 12
# TRUE: EDGE Multislot Class 10
@@ -843,6 +828,7 @@
# This will affect the footprint size.
# (buffers & tables used by different category)
# Option Values:
+ # DL_CAT_1: no UL 64 QAM
# DL_CAT_12: max DL 3CC 256QAM, DL tput <= 600
# (including DL_CAT13 for 2CC 256QAM, DL_CAT13=400)
# DL_CAT_13: max DL 2CC 256QAM, DL tput <= 400
@@ -888,13 +874,7 @@
# For example:
# LTE_RF_MODULE = MT6169_LTE
# Option Values:
- # CAYMUS_LTE_MT6197: CAYMUS+MT6197
- # CHANDON_LTE_MT6197_FPGA: CHANDON+MT6197
- # MT6169_LTE: The RF module name for LTE
- # MT6985_LTE_MT6195: The MT6985+MT6195 RF custom folder
- # MT6990_LTE_MT6195: MT6990_LTE_MT6195
- # The MT6990+MT6195 RF custom folder
- # NONE: Default settings if there is no need to define the LTE RF module
+ # N/A
# Switch-ability:
# Non-switchable
@@ -905,6 +885,7 @@
# (buffers & tables used by different category)
# Option Values:
# NONE: NONE (default = UL_CAT_5)
+ # UL_CAT_1: UL category 1
# UL_CAT_13: max UL 2CC 64QAM, UL tput <= 150
# UL_CAT_15: max UL 3CC 64QAM, UL tput <= 225
# UL_CAT_18: max UL 2CC 256QAM, UL tput <= 200
@@ -916,10 +897,10 @@
MCD_CODESET_SHIFT_SUPPORT = 440000
# Description:
# NONE: if Codeset Shift not support
- # 440000: if Codeset shift support by Docomo (Plmn ID: 440000) You can enumerate all suitable support plmn
+ # 440000: if Codeset shift support by OP17 (Plmn ID: 440000) You can enumerate all suitable support plmn
# Option Values:
# 440000: not support codec shift
- # NONE: support codec shift for DOCOMO LAB test
+ # NONE: support codec shift for OP17 LAB test
# Switch-ability:
# Non-switchable
@@ -954,7 +935,7 @@
# Description:
# Describe the Multi-Mode RF module used in this project for Customization
# Option Values:
- # NONE: Default settings if there is no need to define
+ # N/A
# Switch-ability:
# Non-switchable
@@ -1142,6 +1123,7 @@
# NR_V15_5_1_RELEASE: TS 38.331 v15.5.1 (2019-03)
# NR_V15_6_0_RELEASE: TS 38.331 v15.6.0 (2019-06)
# NR_V17_1_0_RELEASE: TS 38.331 v17.1.0 (2022-06)
+ # NR_V17_2_0_RELEASE: TS 38.331 v17.2.0 (2022-09)
# Switch-ability:
# Non-switchable
@@ -1151,9 +1133,7 @@
# For example:
# NR_RF_MODULE = MT6190_NR
# Option Values:
- # MT6190_NR: The RF module name for NR
- # MT6985_NR_MT6195_US: The RF module name for NR
- # NONE: Default settings if there is no need to define the NR RF module
+ # N/A
# Switch-ability:
# Non-switchable
@@ -1225,7 +1205,7 @@
RF_DRDI_SPECIAL_MEMORY_SUPPORT = FALSE
# Description:
- # this feature option is for extend DRDI to support HTC request
+ # this feature option is for extend DRDI to support Customer request
# Option Values:
# FALSE: Disable this feature
# TRUE: Enable this feature
@@ -1237,7 +1217,6 @@
# The RTOS used in the load
# Option Values:
# MERTOS: Use MERTOS as OS
- # NUCLEUS_V2: Use Nucleus 2.x as the OX
# NUCLEUS_V3: Use Nucleus 3 as the OS
# Switch-ability:
# Non-switchable
@@ -1304,12 +1283,7 @@
# Description:
# Define the HSUPA category in makefile.
# Option Values:
- # 1: EDCH Physical category = 1
- # 2: EDCH Physical category = 2
- # 3: EDCH Physical category 3
- # 4: EDCH Physical category = 4
- # 5: EDCH Physical category = 5
- # 6: EDCH Physical category = 6
+ # N/A
# Switch-ability:
# Non-switchable
@@ -1317,21 +1291,7 @@
# Description:
# Define the HSDPA category in makefile.
# Option Values:
- # 1: HSDSCH category = 1
- # 10: HSDSCH category = 10
- # 11: HSDSCH category = 11
- # 12: HSDSCH category = 12
- # 13: HSDSCH category = 13
- # 14: HSDSCH category = 14
- # 15: HSDSCH category = 15
- # 2: HSDSCH category = 2
- # 3: HSDSCH category = 3
- # 4: HSDSCH category = 4
- # 5: HSDSCH category = 5
- # 6: HSDSCH category = 6
- # 7: HSDSCH category = 7
- # 8: HSDSCH category = 8
- # 9: HSDSCH category = 9
+ # N/A
# Switch-ability:
# Non-switchable
@@ -1626,7 +1586,7 @@
# Description:
# This Option could configure C2K RF module type based on the RF chip type the custom used.
# Option Values:
- # N/A
+ # NONE: no project
# Switch-ability:
# Non-switchable
@@ -1691,6 +1651,7 @@
# Description:
# To distinguish compiler version
# Option Values:
+ # MIPS_CLANGV13: mipc clang v13
# MIPS_GCCV4: mips gcc v4
# MIPS_GCCV6: mips gcc v6
# Switch-ability:
@@ -1927,8 +1888,8 @@
EXT_PMIC = NONE
# Description:
- # Enable EXT_PMIC = MT6315 at EVB/SP project, like MT6885_EVB(xxxx).mak and MT6885_SP(xxxx).mak
- # Enable EXT_PMIC = NONE at FPGA project, like MT6885_FPGA(xx).mak and PETRUS_FPGA(xxx).mak
+ # Enable EXT_PMIC = MT6315 at EVB/SP project, like MT68xx_EVB(xxxx).mak and MT68xx_SP(xxxx).mak
+ # Enable EXT_PMIC = NONE at FPGA project, like MT68xx_FPGA(xxxx).mak
# Option Values:
# N/A
# Switch-ability:
@@ -1966,8 +1927,7 @@
# Description:
# Use NAND to place update package for NOR project
# Option Values:
- # FALSE: Place diff package on NOR
- # TRUE: Enable FOTA update package in NAND for NOR project
+ # N/A
# Switch-ability:
# Non-switchable
@@ -2345,8 +2305,7 @@
# Determine if LTE OTDOA positioning is supported.
# Note: LTE_OTDOA_SUPPORT can be turned on only if EUTRAN_MODE_SUPPORT and LPP_SUPPORT is defined.
# Option Values:
- # FALSE: Disable LTE OTDOA positioning feature
- # TRUE: Enable LTE OTDOA positioning feature
+ # N/A
# Switch-ability:
# Non-switchable
@@ -2434,7 +2393,7 @@
MD_TCPIP_SUPPORT = TRUE
# Description:
- # Support TCPIP stack, it will create corresponding tasks and HISR, and enable related features.
+ # Support TCPIP stack, it will create corresponding tasks and DIP, and enable related features.
# Option Values:
# FALSE: Disable MD TCP/IP stack
# TRUE: Enable MD TCP/IP stack
@@ -2462,8 +2421,7 @@
# Description:
# Based on SKU requirement, FE device database can be select by customer.
# Option Values:
- # MMRF_DB_INTERNAL: FE device DB is more.
- # MMRF_DB_RELEASE: FE device DB is more.
+ # N/A
# Switch-ability:
# Non-switchable
@@ -2491,10 +2449,11 @@
# Option to switch modem 3GPP specification version.
# Option Values:
# NONE: NONE
- # SPEC_2018DEC: 2018-Dec specification version
- # SPEC_2018SEP: 2018-Sep specification version
- # SPEC_2020DEC: 2020-DEC specification version
- # SPEC_2022JUN: 2022-JUN specification version
+ # SPEC_2018DEC: 2018-Dec. specification version
+ # SPEC_2018SEP: 2018-Sep. specification version
+ # SPEC_2020DEC: 2020-Dec. specification version
+ # SPEC_2022JUN: 2022-Jun. specification version
+ # SPEC_2022SEP: 2022-Sep. specification version
# Switch-ability:
# Non-switchable
@@ -2502,15 +2461,18 @@
# Description:
# Bluetooth chip type for BT phone call
# Option Values:
- # FEFEFE: fefe
# MTK_CONSYS_MT6571: Need to support software BT codec (CVSD / mSBC).
# MTK_CONSYS_MT6572: Need to support software BT codec (CVSD / mSBC).
# MTK_CONSYS_MT6582: Need to support software BT codec (CVSD / mSBC).
# MTK_CONSYS_MT6592: Need to support software BT codec (CVSD / mSBC).
# MTK_CONSYS_MT6752: Need to support software BT codec (CVSD / mSBC).
# MTK_CONSYS_MT6789: Need to support software BT codec (CVSD / mSBC).
+ # MTK_CONSYS_MT6813: MTK_CONSYS_MT6813
+ # MTK_CONSYS_MT6815: MTK_CONSYS_MT6815
# MTK_CONSYS_MT6835: Need to support software BT codec (CVSD / mSBC).
+ # MTK_CONSYS_MT6878: MTK_CONSYS_MT6878
# MTK_CONSYS_MT6886: Need to support software BT codec (CVSD / mSBC).
+ # MTK_CONSYS_MT6897: MTK_CONSYS_MT6897
# MTK_CONSYS_MT6985: Need to support software BT codec (CVSD / mSBC).
# MTK_MT6620: Need to support BT phone call PCM interface.
# MTK_MT6622: Need to support BT phone call PCM interface.
@@ -2557,8 +2519,7 @@
N5G_ADAPTOR_SUPPORT = FALSE
# Description:
- # Option to enable dummy layer 1 (Protocol Stack Adaptor) for NR 5G in UESIM environment.
- # Enabled on VMOLY, VMOLYM and VMOLYN depots and Disabled on others (older ones)
+ # Option to enable dummy layer 1 (Protocol Stack Adaptor) for NR 5G in UESIM environment. Set to TRUE in all UESIM projects except those for C2K
# Option Values:
# FALSE: auto created - value no
# TRUE: auto created - value yes
@@ -2616,8 +2577,7 @@
# Description:
# Set the OS tick period in micro second
# Option Values:
- # 4615: For backward compatible, not suggested
- # 5000: Default OS Tick Period
+ # N/A
# Switch-ability:
# Non-switchable
@@ -2692,7 +2652,7 @@
# Description:
# Name of BB-chip.
# Option Values:
- # NA: N/A
+ # N/A
# Switch-ability:
# Non-switchable
@@ -2713,10 +2673,12 @@
# MT6318: .
# MT6326: .
# MT6326_CCCI: .
+ # MT6330: for MT6330 PMIC
# MT6361: .
# MT6363: for Main PMIC use
# MT6365: for MT6365
# MT6377: Add PMIC MT6377
+ # MT6378: For MT6378 PMIC
# MT6573PMU: .
# NONE: No PMU/PMIC on PCB
# Switch-ability:
@@ -2791,7 +2753,7 @@
# Description:
# describe the RF module used in this project
# Option Values:
- # NA: the RF module used in this project
+ # N/A
# Switch-ability:
# Switchable
@@ -2903,7 +2865,7 @@
# To distinguish if it is a smart phone MODEM makefile or a smart phone APP makefile. NONE means it is not a smart-phone make file
# Option Values:
# ANDROID_MODEM: modem processor software load for Android smart phone
- # MODEM_ONLY: in-house testing load running on modem processor
+ # MODEM_ONLY: SW load for standalone running on modem processor
# NONE: .
# Switch-ability:
# Non-switchable
@@ -2912,7 +2874,8 @@
# Description:
# SIM-ME lock support
# Option Values:
- # N/A
+ # FALSE: SIM-ME LOCK NOT SUPPORT
+ # TRUE: SIM-ME LOCK SUPPORT
# Switch-ability:
# Non-switchable
@@ -3078,7 +3041,7 @@
# This option is used specify which RF module is used in UL1D RF driver
# "UL1D" means UMTS Layer 1 Driver.
# Option Values:
- # MT6162: the RF module used in this project
+ # N/A
# Switch-ability:
# Non-switchable
@@ -3086,7 +3049,7 @@
# Description:
# Modem Capability
# Option Values:
- # NA: the RF module used in this project
+ # N/A
# Switch-ability:
# Non-switchable
@@ -3219,11 +3182,11 @@
HW_VER = MOBILETEK35_IVT_T800_HW
-ORIGINAL_VERNO = MOLY.NR15.R3.MD700.MP.V75.P5
+ORIGINAL_VERNO = MOLY.NR15.R3.MD700.MP.V75.P6
-VERNO = MOLY.NR15.R3.MD700.MP.V75.P5
+VERNO = MOLY.NR15.R3.MD700.MP.V75.P6
+CUSTOMER_LABEL = MOLY.NR15.R3.MD700.MP.V75_MOBILETEK35.IVT.T800_P6
-CUSTOMER_LABEL = MOLY.NR15.R3.MD700.MP.V75_MOBILETEK35.IVT.T800_P5
# *************************************************************************
# TK MD Custom Feature Option Configuration
@@ -3265,6 +3228,8 @@
CUSTOM_OPTION += __LTE_EL1_4X4_MIMO_SUPPORT__
CUSTOM_OPTION += __MIPI_REGISTER0_WRITE_FOR_ELNA_GAIN_CW__
+CUSTOM_OPTION += __ENABLE_NR_CUSTOMIZED_PAGING_CYCLE__
+CUSTOM_OPTION += __SBP_EXTEND_LTE_PAGING_CYCLE__
# *************************************************************************
# Component trace definition header files for custom release only
# *************************************************************************