[Feature][Modem]Update MTK MODEM V1.6 baseline version: MOLY.NR15.R3.MD700.IVT.MP1MR3.MP.V1.6

MTK modem version: MT2735_IVT_MOLY.NR15.R3.MD700.IVT.MP1MR3.MP.V1.6.tar.gz
RF  modem version: NA

Change-Id: I45a4c2752fa9d1a618beacd5d40737fb39ab64fb
diff --git a/mcu/make/module/service/asn1_common/extern/asn1_common.mak b/mcu/make/module/service/asn1_common/extern/asn1_common.mak
new file mode 100644
index 0000000..dca6d4e
--- /dev/null
+++ b/mcu/make/module/service/asn1_common/extern/asn1_common.mak
@@ -0,0 +1,13 @@
+# Define source file lists to SRC_LIST

+SRC_LIST = ./interface/service/asn1_common/asn_common.c \
+           ./interface/service/asn1_common/asn_uper_common.c \
+           ./interface/service/asn1_common/asn_memory.c
+

+#  Define include path lists to INC_DIR

+INC_DIR = 

+

+# Define the specified compile options to COMP_DEFS

+COMP_DEFS = 

+

+# Define the source file search paths to SRC_PATH

+SRC_PATH = ./interface/service/asn1_common
diff --git a/mcu/make/module/service/config/extern/config.mak b/mcu/make/module/service/config/extern/config.mak
new file mode 100644
index 0000000..45d5f02
--- /dev/null
+++ b/mcu/make/module/service/config/extern/config.mak
@@ -0,0 +1,35 @@
+# Define source file lists to SRC_LIST
+SRC_LIST = ./service/config/src/hal/syscomp_config.c \
+           ./service/config/src/hal/task_config.c \
+           ./service/config/src/hal/stack_config.c \
+           ./service/config/src/hal/ctrl_buff_pool.c\
+           ./service/config/src/hal/mof_config.c
+
+#  Define include path lists to INC_DIR
+INC_DIR = driver/peripheral/inc \
+          ./service/kal/common/include \
+          ./interface/service/dhl
+
+ifneq ($(filter __ESL_MASE_GEN97__,$(CUSTOM_OPTION)),)
+INC_DIR += driver/devdrv/hsl/inc
+endif
+
+# Define the specified compile options to COMP_DEFS
+COMP_DEFS = 
+
+ifeq ($(filter __MTK_TARGET__, $(strip $(MODULE_DEFS))),)
+  # special for AST projects
+  COMP_DEFS += __UL1_ON_MNT__
+endif
+
+# Define the source file search paths to SRC_PATH
+SRC_PATH = ./service/config/src/hal
+
+# MERTOS config, note that the module which include this path must rebuild
+ifeq ($(strip $(RTOS)),MERTOS)
+#  INC_DIR += ./service/mertos_config/include
+endif
+
+ifeq ($(strip $(COMPILER)),GCC)
+    CFLAGS += -Werror
+endif
diff --git a/mcu/make/module/service/dhl/dbinfo.mak b/mcu/make/module/service/dhl/dbinfo.mak
new file mode 100644
index 0000000..0d1a3c8
--- /dev/null
+++ b/mcu/make/module/service/dhl/dbinfo.mak
@@ -0,0 +1,15 @@
+# Define source file lists to SRC_LIST
+SRC_LIST += $(strip $(BUILD_TSTDIR))/src/dbSig.c \
+            $(strip $(BUILD_TSTDIR))/src/filterSig.c \
+            $(strip $(BUILD_TSTDIR))/src/traceKey.c
+
+
+# Define include path lists to INC_DIR
+INC_DIR =
+
+# Define the specified compile options to COMP_DEFS
+COMP_DEFS =
+
+# Define the source file search paths to SRC_PATH
+SRC_PATH =
+ 
diff --git a/mcu/make/module/service/fs/fs.mak b/mcu/make/module/service/fs/fs.mak
new file mode 100644
index 0000000..5a3ef64
--- /dev/null
+++ b/mcu/make/module/service/fs/fs.mak
@@ -0,0 +1 @@
+SRC_LIST = ./service/fs/ccci_fs/src/mdfs_wrapper.c
\ No newline at end of file
diff --git a/mcu/make/module/service/hif/hmu.mak b/mcu/make/module/service/hif/hmu.mak
new file mode 100644
index 0000000..60b518a
--- /dev/null
+++ b/mcu/make/module/service/hif/hmu.mak
@@ -0,0 +1,28 @@
+# Define source file lists to SRC_LIST
+SRC_LIST = service/hif/hmu/src/hmu.c
+SRC_LIST += service/hif/hmu/src/hmu_conf_data.c
+
+
+#  Define include path lists to INC_DIR
+INC_DIR = ./interface/service/hif \
+          ./interface/service/hif \
+		  service/hif/hmu/include \
+		  ./service/hif/interface \
+		  protocol/interface/ddm
+ 
+# Define the specified compile options to COMP_DEFS
+COMP_DEFS = _HMU_
+
+# Define the source file search paths to SRC_PATH
+SRC_PATH = service/hif/hmu/src
+
+ifeq ($(strip $(CUSTOM_RELEASE)),TRUE)
+    #custom
+    ifeq ($(strip $(DHL_SUPPORT)),TRUE)
+      SRC_LIST += $(strip $(CUS_MTK_REL))/dhl/l1trace/hif_srv_hmu_trace_utmd.c
+    else
+      SRC_LIST += $(strip $(CUS_MTK_REL))/tst/l1trace/hif_srv_hmu_trace_utmd.c
+    endif
+else
+  SRC_LIST += $(strip $(CGEN_L1_OUTDIR))/hif_srv_hmu_trace_utmd.c
+endif
\ No newline at end of file
diff --git a/mcu/make/module/service/hif/ubm.mak b/mcu/make/module/service/hif/ubm.mak
new file mode 100644
index 0000000..f86844c
--- /dev/null
+++ b/mcu/make/module/service/hif/ubm.mak
@@ -0,0 +1,35 @@
+# Define source file lists to SRC_LIST
+SRC_LIST = service/hif/ubm/src/ubm.c \
+           service/hif/ubm/src/ubm_drb.c \
+           service/hif/ubm/src/ubm_fhb.c \
+           service/hif/ubm/src/ubm_nfhb.c \
+           service/hif/ubm/src/ubm_ul_meta.c \
+           service/hif/ubm/src/ubm_vrb.c \
+           service/hif/ubm/src/ubm_xit.c
+
+# L1 trace configuration file
+ifeq ($(strip $(CUSTOM_RELEASE)),TRUE)
+    #custom
+    ifeq ($(strip $(DHL_SUPPORT)),TRUE)
+      SRC_LIST += $(strip $(CUS_MTK_REL))/dhl/l1trace/ubm_data_path_trace_utmd.c
+    else
+      SRC_LIST += $(strip $(CUS_MTK_REL))/tst/l1trace/ubm_data_path_trace_utmd.c
+    endif
+else
+  SRC_LIST += $(strip $(CGEN_L1_OUTDIR))/ubm_data_path_trace_utmd.c
+endif
+
+#  Define include path lists to INC_DIR
+INC_DIR = ./interface/service/hif \
+          service/hif/ubm/include \
+          ./service/hif/interface \
+          interface/driver/lhifcore \
+          interface/middleware/hif \
+          interface/driver/hif \
+          ./interface/service/prbm \
+          interface/service/qmu_bm
+
+# Define the specified compile options to COMP_DEFS
+
+# Define the source file search paths to SRC_PATH
+SRC_PATH = service/hif/ubm/src
diff --git a/mcu/make/module/service/kal/ktest.mak b/mcu/make/module/service/kal/ktest.mak
new file mode 100644
index 0000000..647121a
--- /dev/null
+++ b/mcu/make/module/service/kal/ktest.mak
@@ -0,0 +1,87 @@
+# Define source file lists to SRC_LIST
+SRC_PATH = ./service/kal/ktest
+ifneq ($(filter __KTEST__, $(strip $(MODULE_DEFS))),)
+ifneq ($(strip $(KTEST_ENV)), RTOS_TEST)
+ifeq ($(strip $(KTEST_ENV)),STATIC_TEST)
+ifeq ($(strip $(RTOS)),MERTOS)
+SRC_LIST +=./service/kal/ktest/src/adaptation/ktest_adaptation_target_mertos.c
+else
+SRC_LIST +=./service/kal/ktest/src/adaptation/ktest_adaptation_target.c
+endif
+SRC_LIST +=./service/kal/ktest/src/common/ktest_smp.c \
+           ./service/kal/ktest/src/common/ktest_utilities.c \
+           ./service/kal/ktest/src/common/ktest_rtos.c \
+           ./service/kal/ktest/src/tests/ktest_smp_mt.c \
+           ./service/kal/ktest/src/tests/ktest_smp_mem.c \
+           ./service/kal/ktest/src/tests/ktest_smp_misc.c \
+           ./service/kal/ktest/src/tests/ktest_smp_ipc.c \
+           ./service/kal/ktest/src/tests/ktest_smp_timer.c \
+           ./service/kal/ktest/src/tests/ktest_profiler.c
+else
+SRC_LIST +=./service/kal/ktest/src/adaptation/ktest_adaptation_oscar.c \
+           ./service/kal/ktest/src/adaptation/ktest_adaptation_target.c \
+           ./service/kal/ktest/src/common/kal_autotest.c \
+           ./service/kal/ktest/src/common/ktest_interface.c \
+           ./service/kal/ktest/src/common/ktest_utilities.c \
+           ./service/kal/ktest/src/tests/ktest_tc_timer.c \
+           ./service/kal/ktest/src/tests/ktest_tc_nu_timer.c \
+           ./service/kal/ktest/src/tests/ktest_lib_timer.c \
+           ./service/kal/ktest/src/tests/ktest_tc_ipc.c \
+           ./service/kal/ktest/src/tests/ktest_tc_mm_adm.c \
+           ./service/kal/ktest/src/tests/ktest_tc_mm_afm.c \
+           ./service/kal/ktest/src/tests/ktest_tc_mm_ctrlbuf.c \
+           ./service/kal/ktest/src/tests/ktest_tc_task.c \
+           ./service/kal/ktest/src/tests/ktest_tc_utl.c \
+           ./service/kal/ktest/src/tests/ktest_tc_sandbox.c \
+           ./service/kal/ktest/src/tests/ktest_tc_mlib.c \
+           ./service/kal/ktest/src/tests/ktest_tc_slmm.c \
+           ./service/kal/ktest/src/tests/ktest_tc_vm.c 
+endif
+else
+ifeq ($(strip $(RTOS)),MERTOS)
+SRC_LIST +=./service/kal/ktest/src/common/ktest_rtos.c \
+           ./service/kal/ktest/src/common/ktest_utilities.c \
+           ./service/kal/ktest/src/adaptation/ktest_adaptation_target_mertos.c \
+           ./service/kal/ktest/src/tests/ktest_rtos_enh_mutex.c \
+           ./service/kal/ktest/src/tests/ktest_rtos_dpc.c \
+           ./service/kal/ktest/src/tests/ktest_rtos_isr.c \
+           ./service/kal/ktest/src/tests/ktest_rtos_mq.c \
+           ./service/kal/ktest/src/tests/ktest_rtos_timer.c \
+           ./service/kal/ktest/src/tests/ktest_rtos_misc.c \
+           ./service/kal/ktest/src/tests/ktest_rtos_kal_itc.c \
+           ./service/kal/ktest/src/tests/ktest_rtos_kal_buff_mgr.c \
+           ./service/kal/ktest/src/tests/ktest_profiler.c
+else
+SRC_LIST +=./service/kal/ktest/src/common/ktest_rtos.c \
+           ./service/kal/ktest/src/common/ktest_utilities.c \
+           ./service/kal/ktest/src/adaptation/ktest_adaptation_target.c \
+           ./service/kal/ktest/src/tests/ktest_rtos_misc.c \
+           ./service/kal/ktest/src/tests/ktest_profiler.c
+endif
+endif
+endif
+#  Define include path lists to INC_DIR
+INC_DIR = ./interface/service/config \
+          ./interface/service/kal \
+          interface/driver/peripheral \
+          interface/driver/hwdrv \
+          ./service/kal/ktest/inc \
+          ./service/kal/adaptation/include \
+          ./service/kal/common/include \
+          ./service/kal/mlib/include \
+          ./interface/sap/svc \
+          driver/sys_drv/cache/inc/ \
+          driver/sys_drv/init/inc/ \
+          ./service/sst/include \
+          ./service/sst/include \
+          protocol/interface/ims \
+          driver/devdrv/cirq/$(MD_VER_FOLDER)/inc
+
+ifeq ($(strip $(RTOS)),MERTOS)
+INC_DIR += ./service/mertos/include
+endif
+
+# Define the specified compile options to COMP_DEFS
+COMP_DEFS =
+
+
diff --git a/mcu/make/module/service/mcf/extern/mcf.mak b/mcu/make/module/service/mcf/extern/mcf.mak
new file mode 100644
index 0000000..d3e482c
--- /dev/null
+++ b/mcu/make/module/service/mcf/extern/mcf.mak
@@ -0,0 +1,52 @@
+# Define ./interface/modem folder path by project option 
+ifneq ($(filter __MD93__,$(strip $(MODULE_DEFS))),)
+	MD_VER_FOLDER_PATH = mt6293
+else ifneq ($(filter __MD95__,$(strip $(MODULE_DEFS))),)
+	MD_VER_FOLDER_PATH = mt6295
+else ifneq ($(filter __MD97__,$(strip $(MODULE_DEFS))),)
+	MD_VER_FOLDER_PATH = mt6297
+else ifneq ($(filter __MD97P__,$(strip $(MODULE_DEFS))),)
+	MD_VER_FOLDER_PATH = mt6297p
+else
+	#no match chip
+endif
+#
+# Define source file lists to SRC_LIST
+#
+SRC_LIST = service/mcf/src/mcf_if.c \
+           service/mcf/src/mcf_task.c \
+           service/mcf/src/mcf_util.c \
+           service/mcf/src/mcf_task_clean.c
+
+ifeq ($(strip $(MODIS_CONFIG)),TRUE)
+    SRC_LIST += service/mcf/src/mcf_utfwk.c
+    ifneq ($(filter ATEST_SYS_MCF, $(strip $(MODULE_DEFS))),)
+        SRC_LIST += service/mcf/src/mcf_ut.c \
+                    service/mcf/src/mcf_utfwk_sample_code.c
+    endif
+endif
+
+SRC_LIST += $(strip $(PROJDIR))/modem/mcf/mcf_db.c
+
+#
+#  Define include path lists to INC_DIR
+#
+INC_DIR = service/mcf/include \
+          interface/service/mcf \
+          interface/service/nvram \
+          $(UNIVERSAL_COMMON)/interface/modem/$(MD_VER_FOLDER_PATH)/common/nr/external/custom \
+		  
+INC_DIR += $(strip $(PROJDIR))/modem/mcf/
+
+#
+# Define the specified compile options to COMP_DEFS
+#
+ifneq ($(filter ATEST_SYS_MCF, $(strip $(MODULE_DEFS))),)
+    COMP_DEFS += __MCF_FIND_TAG_SUPPORT__
+endif
+COMP_DEFS += __MCF_FIND_GID_SUPPORT__
+
+#
+# Define the source file search paths to SRC_PATH
+#
+SRC_PATH = service/mcf/src
diff --git a/mcu/make/module/service/mertos/extern/mertos_config.mak b/mcu/make/module/service/mertos/extern/mertos_config.mak
new file mode 100644
index 0000000..f4a13cf
--- /dev/null
+++ b/mcu/make/module/service/mertos/extern/mertos_config.mak
@@ -0,0 +1,21 @@
+# Define source file lists to SRC_LIST
+SRC_LIST  = service/mertos_config/src/mer_config_task.c \
+            service/mertos_config/src/mer_config_fixmem.c \
+            service/mertos_config/src/mer_config_sync_enhmutex.c 
+             
+# Define include path lists to INC_DIR
+INC_DIR  =  service/mertos/include \
+            interface/service/kal \
+            service/mertos_config/include \
+			service/kal/os/mertos/include
+
+
+# Define the specified compile options to COMP_DEFS
+COMP_DEFS = _MER_SERVICE_CPU_INTERAPTIV_ __ESL_DBG_UTIL__
+COMP_DEFS = __MER_CONFIG_MUST_REBUILD__
+
+
+# Define the source file search paths to SRC_PATH
+SRC_PATH  = service/mertos_config/src 
+ 
+
diff --git a/mcu/make/module/service/mtf/mtf.mak b/mcu/make/module/service/mtf/mtf.mak
new file mode 100755
index 0000000..bb16b2b
--- /dev/null
+++ b/mcu/make/module/service/mtf/mtf.mak
@@ -0,0 +1,20 @@
+# Define source file lists to SRC_LIST
+SRC_LIST += service/mtf/base/mt_dispatcher.c \
+			service/mtf/base/mt_task.c \
+			service/mtf/base/mt_task_clean.c \
+			service/mtf/formatter/mtf_base.c \
+			service/mtf/formatter/mtf_icd.c \
+			service/mtf/formatter/mtf_ilm.c \
+			service/mtf/formatter/mtf_peer_trace.c \
+			service/mtf/translate_elements/mte_base.c \
+# Define include path lists to INC_DIR
+INC_DIR =   service/mtf/inc \
+			interface/service/mtf \
+			interface/service/icd \
+			interface/protocol/general \
+			interface/sap/md \
+			$(strip $(PROJDIR))/modem/icd_ac_gen
+
+# Define the specified compile option to COMP_DEFS
+COMP_DEFS =
+
diff --git a/mcu/make/module/service/nvram/extern/nvram.mak b/mcu/make/module/service/nvram/extern/nvram.mak
new file mode 100644
index 0000000..de270ef
--- /dev/null
+++ b/mcu/make/module/service/nvram/extern/nvram.mak
@@ -0,0 +1,172 @@
+# Define ./interface/modem folder path by project option 
+ifneq ($(filter __MD93__,$(strip $(MODULE_DEFS))),)
+	MD_VER_FOLDER_PATH = mt6293
+else ifneq ($(filter __MD95__,$(strip $(MODULE_DEFS))),)
+	MD_VER_FOLDER_PATH = mt6295
+else ifneq ($(filter __MD97__,$(strip $(MODULE_DEFS))),)
+	MD_VER_FOLDER_PATH = mt6297
+else ifneq ($(filter __MD97P__,$(strip $(MODULE_DEFS))),)
+	MD_VER_FOLDER_PATH = mt6297p
+else
+	#no match chip
+endif
+# Define source file lists to SRC_LIST
+SRC_LIST = ./service/nvram/src/nvram_factory_config.c \
+           ./service/nvram/src/nvram_handler_read.c \
+           ./service/nvram/src/nvram_handler_reset.c \
+           ./service/nvram/src/nvram_handler_startup.c \
+           ./service/nvram/src/nvram_handler_write.c \
+		   ./service/nvram/src/nvram_handler_monitor.c \
+           ./service/nvram/src/nvram_drval_fat.c \
+           ./service/nvram/src/nvram_ilm.c \
+           ./service/nvram/src/nvram_io.c \
+           ./service/nvram/src/nvram_ltable.c \
+           ./service/nvram/src/nvram_main.c \
+           ./service/nvram/src/nvram_multi_folder.c \
+           ./service/nvram/src/nvram_interface.c \
+           ./service/nvram/src/nvram_l1def.c \
+           ./service/nvram/src/nvram_util.c \
+           ./service/nvram/src/nvram_el1def.c \
+           ./service/nvram/src/nvram_nl1def.c \
+           ./service/nvram/src/nvram_mml1def.c \
+           ./service/nvram/src/nvram_tl1def.c \
+           ./service/nvram/src/nvram_ltable_register.c
+
+
+ifneq ($(filter __NVRAM_PSEUDO_MERGE__, $(strip $(MODULE_DEFS))),)
+	SRC_LIST += ./service/nvram/src/nvram_pseudo_merge.c
+endif
+ifneq ($(filter __NVRAM_OTP__, $(strip $(MODULE_DEFS))),)
+	SRC_LIST += ./service/nvram/src/nvram_ex_io.c
+endif
+ifneq ($(filter __CUSTOMER_TC01_DISK__, $(strip $(MODULE_DEFS))),)
+	ifneq ($(filter __MTK_UL1_FDD__, $(strip $(MODULE_DEFS))),)
+		SRC_LIST += ./service/nvram/src/nvram_ex_io.c
+	endif	
+endif
+ifneq ($(filter __SYSDRV_BACKUP_DISK__, $(strip $(MODULE_DEFS))),)
+	SRC_LIST += ./service/nvram/src/nvram_ex_io.c
+endif
+
+ifneq ($(filter __SYSDRV_BACKUP_DISK_FAT__, $(strip $(MODULE_DEFS))),)
+	SRC_LIST += ./service/nvram/src/nvram_ex_io.c
+endif
+
+ifneq ($(filter __NVRAM_UT_TEST__, $(strip $(MODULE_DEFS))),)
+	SRC_LIST += ./service/nvram/src/nvram_ex_io.c
+endif
+
+ifneq ($(filter __SYSDRV_BACKUP_DISK_RAW__, $(strip $(MODULE_DEFS))),)
+	SRC_LIST += ./service/nvram/src/nvram_ex_io.c
+	SRC_LIST += ./service/nvram/src/nvram_msg_handler.c
+endif
+ifneq ($(filter __SECURE_DATA_STORAGE__, $(strip $(MODULE_DEFS))),)
+	SRC_LIST += ./service/nvram/src/nvram_ex_io.c
+	SRC_LIST += ./service/nvram/src/nvram_msg_handler.c
+endif
+
+ifneq ($(filter __CCCIFS_SUPPORT__, $(strip $(MODULE_DEFS))),)
+	ifneq ($(filter __MODEM_CARD__, $(strip $(MODULE_DEFS))),)
+		SRC_LIST += ./service/nvram/src/nvram_ex_io.c
+		SRC_LIST += ./service/nvram/src/nvram_msg_handler.c
+	endif	
+endif
+
+ifneq ($(filter __UMTS_RAT__, $(strip $(MODULE_DEFS))),)
+  ifneq ($(filter __MTK_UL1_FDD__, $(strip $(MODULE_DEFS))),)
+    SRC_LIST += ./service/nvram/src/nvram_ul1def.c
+  endif
+endif
+
+ifneq ($(filter __C2K_RAT__ __CL1_TASK_ENABLE__, $(strip $(MODULE_DEFS))),)
+  SRC_LIST += ./service/nvram/src/nvram_cl1def.c
+endif
+
+ifneq ($(filter __NVRAM_COMPRESS_SUPPORT__, $(strip $(MODULE_DEFS))),)
+  SRC_LIST += ./service/nvram/src/nvram_unzip.c
+endif
+
+ifneq ($(filter __SYSDRV_BACKUP_DISK__, $(strip $(MODULE_DEFS))),)
+  SRC_LIST += ./service/nvram/src/nvram_msg_handler.c
+endif
+
+ifneq ($(filter __CUSTOMER_TC01_DISK__, $(strip $(MODULE_DEFS))),)
+  SRC_LIST += ./service/nvram/src/nvram_msg_handler.c
+endif
+
+ifneq ($(filter __SECURE_DATA_STORAGE__, $(strip $(MODULE_DEFS))),)
+  SRC_LIST += ./service/nvram/src/nvram_msg_handler.c
+endif
+
+ifneq ($(filter TST_HANDLER, $(strip $(MODULE_DEFS))),)
+  SRC_LIST += ./service/nvram/src/nvram_handler_tst.c
+endif
+
+ifneq ($(filter __NVRAM_UNIT_TEST__, $(strip $(MODULE_DEFS))),)
+  SRC_LIST += ./service/nvram/src/nvram_tst.c
+endif
+
+ifneq ($(filter __NVRAM_UT_TEST__, $(strip $(MODULE_DEFS))),)
+  SRC_LIST += ./service/nvram/src/nvram_ut_test.c
+endif
+
+ifneq ($(filter __NVRAM_LID_CACHE__, $(strip $(MODULE_DEFS))),)
+  SRC_LIST += ./service/nvram/src/nvram_cache.c
+  SRC_LIST += ./service/nvram/src/nvram_cache_dirty_valid_mask.c
+  SRC_LIST += ./service/nvram/src/nvram_cache_event.c
+  SRC_LIST += ./service/nvram/src/nvram_cache_queue.c
+  SRC_LIST += ./service/nvram/src/nvram_cache_white_list.c
+  SRC_LIST += ./service/nvram/src/nvram_pre_read.c
+endif
+
+ifneq ($(filter __NV_CHKSUM_ENHANCE__, $(strip $(MODULE_DEFS))),)
+  SRC_LIST += ./service/nvram/src/nvram_chksum_algorithm.c
+endif
+
+# ifneq ($(filter __XXX__, $(strip $(MODULE_DEFS))),)
+#	SRC_LIST += xxxx\xxxxx\AAA.c
+# endif
+# ifeq ($(strip $(NAND_SUPPORT)),FALSE)
+#                SRC_LIST += xxxx
+# endif
+
+# Define include path lists to INC_DIR
+INC_DIR = ./service/nvram/include \
+          ./custom/middleware/common \
+          ./interface/service/mcf \
+          ./interface/l1/el1/external/comm/rf_custom/inc \
+          ./interface/l1/cl1/rfd/external/comm/rf_custom \
+          ./interface/driver/devdrv/busmpu \
+          ./interface/service/hif \
+          ./interface/driver/sleep_drv\
+           interface/l1/nl1/external \
+           $(UNIVERSAL_COMMON)/interface/modem/$(MD_VER_FOLDER_PATH)/common/nr/external/5g \
+           $(UNIVERSAL_COMMON)/interface/modem/$(MD_VER_FOLDER_PATH)/common/nr/external/custom \
+         
+ifneq ($(filter __MD97__ __MD97P__,$(strip $(MODULE_DEFS))),)
+INC_DIR += interface/l1/nl1/external/
+INC_DIR += interface/l1/nl1/external/5g
+INC_DIR += interface/l1/nl1/external/4g
+endif
+
+
+ifneq ($(filter __NVRAM_LID_CACHE__, $(strip $(MODULE_DEFS))),)
+  INC_DIR += $(strip $(PROJDIR))/nvram_auto_gen/
+endif
+
+ifeq ($(strip $(LGE_SECURITY)), TRUE)
+    INC_DIR += custom/modem/lgesecurity
+endif
+          
+# Define the specified compile options to COMP_DEFS
+COMP_DEFS =
+
+# Define the source file search paths to SRC_PATH
+SRC_PATH = ./service/nvram/src
+
+COMP_DEFS += CURR_MODULE=MOD_$(strip $(call Upper,$(COMPONENT))) 
+
+#fdr_reorg
+INC_DIR += interface/l1/cl1/common
+
+NO_LTO := TRUE
diff --git a/mcu/make/module/service/oscar/oscar.mak b/mcu/make/module/service/oscar/oscar.mak
new file mode 100644
index 0000000..6762538
--- /dev/null
+++ b/mcu/make/module/service/oscar/oscar.mak
@@ -0,0 +1,27 @@
+# Define source file lists to SRC_LIST
+SRC_LIST = MoDIS_VC9/oscar/src/osc_main.c \
+           MoDIS_VC9/oscar/src/osc_platform.c \
+           MoDIS_VC9/oscar/src/osc_queue.c \
+           MoDIS_VC9/oscar/src/osc_semaphore.c \
+           MoDIS_VC9/oscar/src/osc_enhmutex.c \
+           MoDIS_VC9/oscar/src/osc_system.c \
+           MoDIS_VC9/oscar/src/osc_thread.c \
+           MoDIS_VC9/oscar/src/osc_timer.c \
+           MoDIS_VC9/oscar/src/osc_utility.c \
+           MoDIS_VC9/oscar/src/osc_buffer.c \
+           MoDIS_VC9/oscar/src/osc_event.c \
+           MoDIS_VC9/oscar/src/osc_critical_section.c \
+           MoDIS_VC9/oscar/src/osc_swla.c
+ 
+# Define include path lists to INC_DIR
+INC_DIR = MoDIS_VC9/oscar/include
+
+# Define the specified compile options to COMP_DEFS
+ifeq ($(strip $(UE_SIMULATOR)), TRUE)
+COMP_DEFS = __UT_ISR_OPTIMIZE__
+
+endif
+
+# Define the source file search paths to SRC_PATH
+SRC_PATH = MoDIS_VC9/oscar/src
+ 
diff --git a/mcu/make/module/service/service_config.mak b/mcu/make/module/service/service_config.mak
new file mode 100644
index 0000000..fc21403
--- /dev/null
+++ b/mcu/make/module/service/service_config.mak
@@ -0,0 +1,18 @@
+ifeq ($(strip $(RTOS)),MERTOS)

+  CATEGORY_INCDIRS += ./service/mertos/include

+  CATEGORY_INCDIRS += ./service/kal/common/include

+  CATEGORY_INCDIRS += ./service/kal/os/mertos/include

+  CATEGORY_INCDIRS += ./service/kal/lib/mlib/include

+endif

+

+CATEGORY_INCDIRS += ./service/sst/include

+CATEGORY_INCDIRS += ./service/sst/include

+CATEGORY_INCDIRS += ./service/fs/common/include

+

+CATEGORY_DEFS += 

+

+ifeq ($(strip $(LTO_BUILD)),TRUE)

+  ifeq ($(strip $(NO_LTO)),)

+      CFLAGS += -flto -fno-fat-lto-objects

+  endif

+endif

diff --git a/mcu/make/module/service/sss/sss.mak b/mcu/make/module/service/sss/sss.mak
new file mode 100644
index 0000000..b864126
--- /dev/null
+++ b/mcu/make/module/service/sss/sss.mak
@@ -0,0 +1,77 @@
+##############################################################
+# Define bootloader folder path
+##############################################################
+
+# Define source file lists to SRC_LIST
+           
+ifneq ($(filter __SV5_ENABLED__ __SV5X_ENABLED__,$(strip $(MODULE_DEFS))),)
+SRC_LIST = ./service/sss/components/src/SSS_secure_shared_v5.c \
+           ./service/sss/components/src/SSS_efuse_blow.c \
+           ./service/sss/components/crypto/src/br_crypto_common.c \
+           ./service/sss/components/crypto/src/br_crypto_drv.c \
+           ./service/sss/components/crypto/src/br_crypto_drv_M1_RSA.c \
+           ./service/sss/components/crypto/src/br_crypto_drv_SEJ_AES_HW.c \
+           ./service/sss/components/crypto/src/br_crypto_drv_SEJ_AES_SW.c \
+           ./service/sss/components/crypto/src/br_crypto_drv_SHA256_SW.c \
+           ./service/sss/components/crypto/src/br_crypto_lib.c \
+           ./service/sss/components/crypto/src/br_crypto_scheme.c \
+           ./service/sss/components/crypto/src/br_sd_crypto.c \
+           ./service/sss/components/crypto/src/br_M1_RSA_v1.c \
+           ./service/sss/components/crypto/src/br_sha256_sw.c \
+           ./service/sss/components/crypto/src/br_aes_sw.c
+endif
+ 
+# Define include path lists to INC_DIR
+INC_DIR = ./service/sst/include \
+          ./service/sst/include_sec \
+          ./service/sss/components/inc \
+          ./service/sss/interface/inc \
+          driver/drv/include \
+          driver/che/include \
+          ./service/sss/interface/crypto/export/public \
+          ./service/sss/components/crypto/export/private \
+          ./service/sss/components/crypto/inc \
+          ./service/sss/components/GFH/private \
+          ./service/sys_svc/gfh/public \
+          ./service/sys_svc/profile/inc \
+          ./interface/service/sst
+ 
+# Define the specified compile options to COMP_DEFS
+COMP_DEFS = APCS_INTWORK \
+            __MTK_SECURE_PLATFORM__ \
+            __CP_DEFINED_ALL_CONTEXT__ \
+            __CP_DEFINED_WORKING_BUF__ \
+            __CRYPTO_ENCRYPT__  \
+            __CRYPTO_SCHEME__ \
+            __CRYPTO_LIB__ \
+            __CS_SIG_SINGLE__ \
+            __CS_MTK_CIPHER__ \
+            __CS_CIPHER__ \
+            __CS_HASH__ \
+            __CL_GFH_SIG__ \
+            __CL_MTK_CIPHER__ \
+            __CL_SIG_SINGLE_AND_PHASH_V1__ \
+            __CL_SIG_MULTI_V1__ \
+            __RSA_SW__ \
+            __SHA256_SW__ \
+            __SHA1_SW__ \
+            __SOE_AES_HW__ \
+            __SEJ_AES_HW__ \
+            __AES_SW__ \
+            __AES_HW__ \
+            __3DES_SW__  \
+            __TIME_STAMP__
+
+#            __SEJ_3DES_HW__ \
+#            __3DES_HW__ \
+#            __SHA256_HW__ \
+#            __SHA1_HW__ \
+
+# Turn-on asembly support. To sync with BootROM
+#COMP_DEFS +=__SHA1_HW_ASM__ \
+#            __SEJ_AES_HW_ASM__
+
+# Define the source file search paths to SRC_PATH
+SRC_PATH = ./service/sss/components/src \
+           ./service/sss/components/crypto/src
+ 
diff --git a/mcu/make/module/service/sys_svc/extern/sys_svc.mak b/mcu/make/module/service/sys_svc/extern/sys_svc.mak
new file mode 100644
index 0000000..d365cef
--- /dev/null
+++ b/mcu/make/module/service/sys_svc/extern/sys_svc.mak
@@ -0,0 +1,126 @@
+##############################################################
+# Define bootloader folder path
+##############################################################
+
+# Define source file lists to SRC_LIST
+      SRC_LIST = ./service/sys_svc/excep_hdlr/src/excep_hdlr.c
+
+ifneq ($(filter __SV5_ENABLED__, $(strip $(MODULE_DEFS))),)
+      SRC_LIST += ./service/sys_svc/gfh/public/br_GFH_parser.c
+      SRC_LIST += ./service/sys_svc/gfh/public/br_GFH_file_info.c
+      SRC_LIST += ./service/sys_svc/ftl/src/FTL.c
+else ifneq ($(filter __SV5X_ENABLED__, $(strip $(MODULE_DEFS))),)
+      SRC_LIST += ./service/sys_svc/ftl/src/FTL.c
+      SRC_LIST += ./service/sys_svc/gfh/public/br_GFH_parser.c
+      SRC_LIST += ./service/sys_svc/gfh/public/br_GFH_file_info.c
+else
+      SRC_LIST += ./service/sys_svc/gfh/public/br_GFH_parser.c
+      SRC_LIST += ./service/sys_svc/gfh/public/br_GFH_file_info.c
+endif
+
+
+ifneq ($(filter __MTK_TARGET__, $(strip $(MODULE_DEFS))),)
+      SRC_LIST += ./service/sys_svc/region/src/init_memory_stack.c
+endif
+
+ifneq ($(filter __MD93__, $(strip $(MODULE_DEFS))),)
+	SRC_LIST += ./service/sys_svc/gfh/public/Gen93/maui_GFH_body.c
+else ifneq ($(filter __MD95__, $(strip $(MODULE_DEFS))),)
+	SRC_LIST += ./service/sys_svc/gfh/public/maui_GFH_body.c
+else ifneq ($(filter __MD97__ __MD97P__, $(strip $(MODULE_DEFS))),)
+	SRC_LIST += ./service/sys_svc/gfh/public/maui_GFH_body.c
+else
+	#error "no chip matched for maui_GFH_body design"
+endif
+
+SRC_LIST += ./service/sys_svc/region/src/regioninit_c_gcc.c
+
+ifeq ($(strip $(COMPILER)), GCC)
+   ifneq ($(filter __MTK_TARGET__, $(strip $(MODULE_DEFS))),)
+      SRC_LIST += ./service/sys_svc/region/src/stack_gcc.S
+      SRC_LIST += ./service/sys_svc/region/src/regioninit_gcc.S
+   endif
+else  # RVCT
+   ifneq ($(filter __MTK_TARGET__, $(strip $(MODULE_DEFS))),)
+      SRC_LIST += ./service/sys_svc/region/src/stack_rvct.S
+      SRC_LIST += ./service/sys_svc/region/src/regioninit_rvct.S
+      SRC_LIST += ./service/sys_svc/region/src/l6478e.s
+   endif
+endif
+
+
+ifeq ($(TS_PROFILING),TRUE)
+      SRC_LIST += ./service/sys_svc/profile/src/br_time_stamp.c
+      SRC_LIST += ./service/sys_svc/profile/src/maui_time_stamp_util.c
+      SRC_LIST += ./service/sys_svc/profile/src/time_stamp_timer.c
+endif
+
+ifneq ($(filter __LTE_RAT__, $(strip $(MODULE_DEFS))),)
+       SRC_LIST += ./service/sys_svc/dspfm_lte/src/dspfm.c
+endif
+
+SRC_LIST += ./service/sys_svc/brom_ext/src/brom_ext.c
+
+###################################################################
+# Define include path lists to INC_DIR
+INC_DIR = ./service/sst/include \
+          ./service/sst/include \
+          $(strip $(PROJDIR))/verno \
+          ./service/ssf/inc \
+          ./service/sss/interface/inc \
+          driver/peripheral/inc \
+          driver/storage/flash/fdm/inc \
+          driver/sys_drv/cache/inc \
+          driver/sys_drv/cache/inc/$(MD_VER_FOLDER) \
+          driver/sys_drv/init/inc \
+          driver/sys_drv/pmu/inc \
+          ./service/sys_svc/region/inc \
+          ./service/sys_svc/excep_hdlr/inc \
+          ./service/sys_svc/gfh/public \
+          ./service/sys_svc/profile/inc \
+          ./service/sys_svc/dspfm_lte/inc \
+          interface/driver/regbase \
+          interface/driver/devdrv/busmpu \
+          ./interface/service/sst \
+          ./service/sys_svc/brom_ext/inc \
+          ./interface/service/mdmp \
+          ./interface/service/hif \
+          driver/sys_drv/mpu/inc/$(MD_VER_FOLDER)
+
+###################################################################
+# Define the specified compile options to COMP_DEFS
+COMP_DEFS = APCS_INTWORK
+
+COMP_DEFS += $(strip $(PLATFORM))
+
+
+ifeq ($(strip $(NEED_BUILD_BOOTLOADER)),TRUE)
+  COMP_DEFS += __BL_ENABLE__
+endif
+
+ifeq ($(strip $(ENHANCED_SINGLE_BANK_NOR_FLASH_SUPPORT)),TRUE)
+  COMP_DEFS += SINGLE_BANK_SUPPORT
+endif
+
+ifeq ($(TS_PROFILING),TRUE)
+    COMP_DEFS   +=  __TIME_STAMP__\
+                    __TIME_STAMP_UTIL__\
+                    __TIME_STAMP_TDMA_TIMER__\
+                    __TIME_STAMP_FORCE_ENABLE__
+endif
+
+ifneq ($(filter __MD93__, $(strip $(MODULE_DEFS))),)
+	#COMP_DEFS +=  __USE_PSS__
+else ifneq ($(filter __MD95__ __MD97__ __MD97P__, $(strip $(MODULE_DEFS))),)
+	COMP_DEFS +=  __CERT_CHAIN_IMG__
+endif
+
+ifneq ($(strip $(COMPILER_ISA)),NANOMIPS)
+%/regioninit_c_gcc.obj: CFLAGS += -minline-intermix
+endif
+
+ifeq ($(strip $(LTO_BUILD)),TRUE)
+%/maui_GFH_body.obj: CFLAGS := $(filter-out -flto -fno-fat-lto-objects, $(CFLAGS))
+%/br_GFH_file_info.obj: CFLAGS := $(filter-out -flto -fno-fat-lto-objects, $(CFLAGS))
+%/br_GFH_parser.obj: CFLAGS := $(filter-out -flto -fno-fat-lto-objects, $(CFLAGS))
+endif
diff --git a/mcu/make/module/service/verno/extern/verno.mak b/mcu/make/module/service/verno/extern/verno.mak
new file mode 100644
index 0000000..f475bf7
--- /dev/null
+++ b/mcu/make/module/service/verno/extern/verno.mak
@@ -0,0 +1,12 @@
+# Define source file lists to SRC_LIST

+SRC_LIST = $(strip $(PROJDIR))/verno/verno.c

+ 

+# Define include path lists to INC_DIR

+INC_DIR =

+

+# Define the specified compile options to COMP_DEFS

+COMP_DEFS =

+

+# Define the source file search paths to SRC_PATH

+SRC_PATH = $(strip $(PROJDIR))/verno

+