[Update][Version]T103R4_SZZT_v02.MP2_MR2.b03.00
Change-Id: I7f5a36245211f5800e7818436b71cdbbfc354f5e
diff --git a/meta/meta-mediatek-mt2731/conf/machine/auto2731evb-ivt-main.conf b/meta/meta-mediatek-mt2731/conf/machine/auto2731evb-ivt-main.conf
index bf490ad..e76b6ec 100755
--- a/meta/meta-mediatek-mt2731/conf/machine/auto2731evb-ivt-main.conf
+++ b/meta/meta-mediatek-mt2731/conf/machine/auto2731evb-ivt-main.conf
@@ -15,7 +15,7 @@
DEFAULTTUNE_virtclass-multilib-lib64 = "aarch64"
#LYNQ
-LYNQ_SW_VERSION = "T103R4_SZZT_v02.MP2_MR2.b02.09"
+LYNQ_SW_VERSION = "T103R4_SZZT_v02.MP2_MR2.b03.00"
SMS_INDEX = "0"
SMS_FLAG = "0"
# lynq
diff --git a/meta/meta-mediatek-mt2731/conf/machine/auto2731evb-ivt-main.conf.bak b/meta/meta-mediatek-mt2731/conf/machine/auto2731evb-ivt-main.conf.bak
deleted file mode 100755
index 8aee8e1..0000000
--- a/meta/meta-mediatek-mt2731/conf/machine/auto2731evb-ivt-main.conf.bak
+++ /dev/null
@@ -1,202 +0,0 @@
-#@TYPE: Machine
-#@NAME:MT2731
-#@DESCRIPTION: Machine configuration for mt2731 32bit
-
-DEFAULTTUNE ?= "cortexa7hf-neon-vfpv4"
-include ${TOPDIR}/../meta/meta-mediatek/conf/machine/arch-arm64-tune-cortexa7-multilib.inc
-
-#Customer Feature Options
-include ${TOPDIR}/../meta/meta-mediatek-ivt/recipes-yummy/features/customer_feature_option.inc
-#Internal Feature Options
-include ${TOPDIR}/../meta/meta-mediatek-ivt/recipes-yummy/features/internal_feature_option.inc
-
-require conf/multilib.conf
-MULTILIBS = "multilib:lib64"
-DEFAULTTUNE_virtclass-multilib-lib64 = "aarch64"
-
-#LYNQ
-LYNQ_SW_VERSION = "T103R4_Hv02.MP2_MR2.V04"
-SMS_INDEX = "0"
-SMS_FLAG = "0"
-# lynq
-YK_SRC = "${TOPDIR}/../src/lynq"
-# Project
-MTK_PROJECT = "mt2731evb-ivt-main"
-TARGET_PLATFORM = "mt2731"
-PROJ = "mt6735_mifi"
-PRJ_FILENAME = "MT2731_IVT_DSDS"
-#LINUX_KERNEL = "linux-4.9.77"
-#KERNELDIR = "../kernel/linux/v4.9"
-LINUX_KERNEL = "linux-3.18.19"
-KERNELDIR = "../kernel/linux/v3.18"
-COMPLIST = "${LINUX_KERNEL}"
-EXTERNALSRC_SYMLINKS = ""
-INHERIT += "packagebbclassappend"
-
-# BACH
-BACH_SRC = "${TOPDIR}/../src/bach/build.bach/work"
-BACH_PREBUILT = "${TOPDIR}/../prebuilt/bach/build.bach/work"
-BACH_PREFIX = "${STAGING_INCDIR}/install"
-
-# Telephony
-TELEPHONY_SRC = "${TOPDIR}/../src/telephony"
-TELEPHONY_PREBUILT = "${TOPDIR}/../prebuilt/telephony"
-
-# Modem
-MODEM_SRC = "${TOPDIR}/../src/modem"
-MODEM_PREBUILT = "${TOPDIR}/../prebuilt/modem"
-
-# Telephony/Modem Feature Options
-# [S] ss / dsss / dsds; [N] dsda / tsts / qsqs
-MTK_MULTI_SIM_SUPPORT = "dsds"
-# [S] C/Lf/Lt/W/T/G, Lf/Lt/W/T/G, Lf/Lt/W/G; [N] Lf/Lt/T/G, W/T/G, W/G, T/G, G
-MTK_PROTOCOL1_RAT_CONFIG = "C/Lf/Lt/W/T/G"
-MTK_PROTOCOL2_RAT_CONFIG = "L/W/G"
-#MTK_PROTOCOL3_RAT_CONFIG = "G"
-# yes / no
-RAT_CONFIG_C2K_SUPPORT = "yes"
-SINGLE_BIN_MODEM_SUPPORT = "yes"
-
-# secure boot
-SECURE_BOOT_ENABLE ?= "yes"
-SECURE_BOOT_TYPE = "avb"
-MTK_KEY_DIR = "${TOPDIR}/../meta/meta-mediatek/conf/machine/keys"
-SBC_RSA_ALGO = "rsa2048"
-SBC_HASH_ALGO = "sha256"
-IMAGE_HASH_ALGO = "sha256"
-SBC_KEY = "sbc_key"
-SBC_KEY_RSA3072 = "sbc_key_3072"
-SBC_KEY_RSA4096 = "sbc_key_4096"
-#VERIFIED_KEY = "verified_key"
-VB_HASH_ALGO = "sha256"
-VB_RSA_ALGO = "rsa2048"
-VERIFIED_KEY = "verified_${VB_RSA_ALGO}_key"
-MTEE_KEY = "mtee_key"
-
-MD_VERIFY = "no"
-
-# Preloader
-PRELOADER_PROJECT = "${MTK_PROJECT}"
-
-# AB update
-AB_OTA_UPDATER = "yes"
-AB_OTA_PARTITIONS = "boot system bl2 bl33 md1img tee vbmeta"
-# LK
-LK_PROJECT = "auto2731evb-ivt-mcp_nand"
-BOOTDEV_TYPE = "nand"
-TARGET_CFLAGS += "-DMTK_BOOTDEV_TYPE=1 -Os"
-NAND_TYPE = "mcp_nand"
-#nand name should be the same with the one in nand-utils/nand_device_list.txt
-#tianyan@2021.09.17 modify for nand+dram start
-NAND_CHIP_NAME = "MT29F4G08ABBFAH"
-#tianyan@2021.09.17 modify for nand+dram end
-#nand brom header version:
-# 1.0 or null: header sytle from Tablet SOC, which is independent of PMBR
-# 2.0: header sytle from mt2712, which is designed for GPT, and is part of PMBR
-NAND_HEADER_VERSION = "3.0"
-FIT_LK_IMAGE = "yes"
-LK_LOAD_OFFSET = "0x1000"
-LK_LOADADDRESS = "0x201000"
-LK_ENTRYPOINT = "0x201000"
-LK_MAX_SIZE = "0x3c000"
-
-# BL33
-BL33_PROJECT = "auto2731evb-ivt-mcp_nand-bl33"
-BL33_LOAD_OFFSET = "0x0"
-BL33_LOADADDRESS = "0x42110000"
-BL33_ENTRYPOINT = "0x42110000"
-BL33_COMPRESS = "none"
-BL33_MAX_SIZE = "0xfd000"
-
-# SPMFW
-SPMFW_IMAGETYPE = "fitImage"
-SPMFW_LOADADDRESS = "0x42100000"
-SPMFW_ENTRYPOINT = "0x42100000"
-SPMFW_COMPRESS = "lz4"
-
-# Trustzone
-TZ_PROJECT = "${MTK_PROJECT}"
-TZ_PLATFORM = "${TARGET_PLATFORM}"
-ATF_SUPPORT = "yes"
-PREFERRED_VERSION_atf = "1.6"
-ATF_INSTALL_MODE = "debug"
-MTK_MACH_TYPE = "mt2731"
-TRUSTZONE_HEADER = "fit"
-TRUSTZONE_ENTRYPOINT = "0x43001000"
-TRUSTZONE_LOADADDRESS = "0x43001000"
-TRUSTZONE_COMPRESS = "none"
-TEE_SUPPORT = "none"
-
-# Kernel
-KERNEL_ARCH = "arm"
-PREFERRED_PROVIDER_virtual/kernel = "linux-mtk-extension"
-PREFERRED_VERSION_linux-mtk-extension ?= "4.14%"
-KERNEL_IMAGETYPE = "fitImage"
-KERNEL_CONFIG = "auto2731evb_ivt_mcp_lp2_nand"
-KBUILD_DEFCONFIG = "${KERNEL_CONFIG}_defconfig"
-DTB_LOADADDRESS = "0x43e30000"
-KERNEL_OUT_DIR = "${BASE_WORKDIR}/${MACHINE_ARCH}-poky-linux-gnueabi/${PREFERRED_PROVIDER_virtual/kernel}/4.14-r0/${PREFERRED_PROVIDER_virtual/kernel}-4.14"
-KERNEL_SRC_DIR = "${KERNEL_OUT_DIR}/source"
-KERNEL_COMPRESS = "lz4"
-KERNEL_DEVICETREE = "auto2731evb-ivt-mcp_lp2_nand.dtb"
-RECOVERY_KERNEL_DEVICETREE = "auto2731evb-ivt-mcp_lp2_nand.dtb"
-# GLIBC version control
-OLDEST_KERNEL_EXTRA ?= "3.18"
-OLDEST_KERNEL = "${OLDEST_KERNEL_EXTRA}"
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-modules"
-
-# LOADER ENTRYPOINT, LOADADDRESS
-UBOOT_ENTRYPOINT = "0x40008000"
-UBOOT_LOADADDRESS = "0x40008000"
-
-#tianyan@2021.09.17 modify for nand+dram start
-# Scatter File
-SCATTER_PROJECT = "auto2731-ivt-mcp_nand_lp4"
-#tianyan@2021.09.17 modify for nand+dram end
-
-# Image FS
-IMAGE_FSTYPES ?= "squashfs"
-IMAGE_ROOTFS_ALIGNMENT = "4"
-EXTRA_IMAGEDEPENDS += "lib64-bl33 lk lib64-trustzone scatter spmfw flashtool mdcert"
-SERIAL_CONSOLES = "921600;ttyGS1"
-
-#tianyan@2021.09.17 modify for nand+dram start
-#UBI/UBIFS ARGS
-MKUBIFS_ARGS = "-m 4096 -e 253952 -c 1400 -F"
-UBINIZE_ARGS = "-m 4096 -p 256KiB -O 4096"
-
-MKUBIFS_CONFIG_ARGS = "-m 4096 -e 253952 -c 22 -F"
-#tianyan@2021.09.17 modify for nand+dram end
-
-# Build Load Type
-BUILD_LOAD_TYPE ?= "eng"
-
-# DRAM TYPE
-MTK_DRAM_TYPE = "LP2"
-
-#anw soft
-ANW_SUPPORT = "NO"
-
-# PMIC chip type
-MTK_PMIC_CHIP_TYPE = "MT6389"
-
-# USB 3.1/PCIe
-#MTK_USB_OR_PCIE = "PCIe"
-MTK_USB_OR_PCIE = "USB"
-
-DEBUG_SUPPORT = "yes"
-
-# GNSS
-MTK_GNSS_CHIP_TYPE = "MT6630"
-
-# For AEE Kernel Config
-KERNEL_AEE_CFG = "${@bb.utils.contains('DEBUG_SUPPORT', 'yes', 'yes', 'no', d)}"
-# For AEE LK Config
-MTK_KEDUMP_MINI_SUPPORT = "${@bb.utils.contains('DEBUG_SUPPORT', 'yes', 'yes', 'no', d)}"
-MTK_MRDUMP_SUPPORT = "${@bb.utils.contains('DEBUG_SUPPORT', 'yes', 'no', 'no', d)}"
-MTK_BOOT_REASON_SUPPORT = "${@bb.utils.contains('DEBUG_SUPPORT', 'yes', 'yes', 'no', d)}"
-# For AEE Native Service Config
-MTK_AEE_SUPPORT = "${@bb.utils.contains('DEBUG_SUPPORT', 'yes', 'yes', 'no', d)}"
-
-#COMBO CHIP
-COMBO_CHIP_ID="mt6630"
\ No newline at end of file