[Feature][T8TSK-321] keep misc in original position
Only Configure: No
Affected branch: MR3.0-Merge-v3.0
Affected module: fota
Is it affected on both ZXIC and MTK: only MTK
Self-test: Yes
Doc Update: No
Change-Id: I12f44165844b10d30dce3534cf56a38e930b43f3
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/recipes-bsp/scatter/files/auto2735-ivt-mcp_nand/partition_nand.xml b/meta-sdk/meta/meta-lynqSDK-T800/recipes-bsp/scatter/files/auto2735-ivt-mcp_nand/partition_nand.xml
index a799248..2e1f835 100755
--- a/meta-sdk/meta/meta-lynqSDK-T800/recipes-bsp/scatter/files/auto2735-ivt-mcp_nand/partition_nand.xml
+++ b/meta-sdk/meta/meta-lynqSDK-T800/recipes-bsp/scatter/files/auto2735-ivt-mcp_nand/partition_nand.xml
@@ -20,23 +20,23 @@
<entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="114048" end="134527" name="md1img_b" />
<entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="134528" end="137087" name="md1dsp_a" />
<entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="137088" end="139647" name="md1dsp_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="139648" end="139903" name="misc" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="139904" end="140223" name="tee_a" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="140224" end="140543" name="tee_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="140544" end="140799" name="mcupm_a" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="140800" end="141055" name="mcupm_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141056" end="141311" name="sspm_a" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141312" end="141567" name="sspm_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141568" end="141823" name="dpm_a" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141824" end="142079" name="dpm_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142080" end="142335" name="medmcu_a" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142336" end="142591" name="medmcu_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142592" end="142719" name="vbmeta_a" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142720" end="142847" name="vbmeta_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142848" end="142975" name="bl2_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142976" end="143167" name="bl33_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="143168" end="143231" name="hsm_os_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="143232" end="148735" name="expdb" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="139648" end="139903" name="mcupm_a" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="139904" end="140159" name="mcupm_b" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="140160" end="140415" name="sspm_a" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="140416" end="140671" name="sspm_b" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="140672" end="140927" name="dpm_a" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="140928" end="141183" name="dpm_b" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141184" end="141439" name="medmcu_a" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141440" end="141695" name="medmcu_b" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141696" end="141823" name="vbmeta_a" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141824" end="141951" name="vbmeta_b" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141952" end="142079" name="bl2_b" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142080" end="142271" name="bl33_b" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142272" end="142335" name="hsm_os_b" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142336" end="147839" name="expdb" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="147840" end="148095" name="misc" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="148096" end="148415" name="tee_a" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="148416" end="148735" name="tee_b" />
<entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="148736" end="156927" name="nvram" />
<entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="156928" end="165119" name="userdata" />
<entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="165120" end="261439" name="log" />
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/files/init_mount_nand b/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/files/init_mount_nand
index 4276246..87d5fcb 100755
--- a/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/files/init_mount_nand
+++ b/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/files/init_mount_nand
@@ -161,7 +161,7 @@
cd /dev/disk/by-partlabel
ln -s ../../mtd6 hsm_bl
ln -s ../../mtd7 hsm_os_a
- ln -s ../../mtd35 hsm_os_b
+ ln -s ../../mtd32 hsm_os_b
ln -s ../../mtd8 boot_para
ln -s ../../mtd9 protect_a
ln -s ../../mtd10 protect_b
@@ -173,24 +173,24 @@
ln -s ../../mtd17 md1img_b
ln -s ../../mtd18 md1dsp_a
ln -s ../../mtd19 md1dsp_b
- ln -s ../../mtd20 misc
- ln -s ../../mtd21 tee_a
- ln -s ../../mtd22 tee_b
- ln -s ../../mtd30 vbmeta_a
- ln -s ../../mtd31 vbmeta_b
- ln -s ../../mtd36 expdb
+ ln -s ../../mtd34 misc
+ ln -s ../../mtd35 tee_a
+ ln -s ../../mtd36 tee_b
+ ln -s ../../mtd28 vbmeta_a
+ ln -s ../../mtd29 vbmeta_b
+ ln -s ../../mtd33 expdb
ln -s ../../mtd0 bl2_a
- ln -s ../../mtd33 bl2_b
+ ln -s ../../mtd30 bl2_b
ln -s ../../mtd1 bl33_a
- ln -s ../../mtd34 bl33_b
- ln -s ../../mtd23 mcupm_a
- ln -s ../../mtd24 mcupm_b
- ln -s ../../mtd25 sspm_a
- ln -s ../../mtd26 sspm_b
- ln -s ../../mtd27 dpm_a
- ln -s ../../mtd28 dpm_b
- ln -s ../../mtd29 medmcu_a
- ln -s ../../mtd30 medmcu_b
+ ln -s ../../mtd31 bl33_b
+ ln -s ../../mtd20 mcupm_a
+ ln -s ../../mtd21 mcupm_b
+ ln -s ../../mtd22 sspm_a
+ ln -s ../../mtd23 sspm_b
+ ln -s ../../mtd24 dpm_a
+ ln -s ../../mtd25 dpm_b
+ ln -s ../../mtd26 medmcu_a
+ ln -s ../../mtd27 medmcu_b
ln -s ../../mtd2 spm_a
ln -s ../../mtd3 spm_b
diff --git a/meta/meta-mediatek-mt2735/recipes-bsp/scatter/files/auto2735-ivt-mcp_nand/partition_nand.xml b/meta/meta-mediatek-mt2735/recipes-bsp/scatter/files/auto2735-ivt-mcp_nand/partition_nand.xml
index a799248..2e1f835 100755
--- a/meta/meta-mediatek-mt2735/recipes-bsp/scatter/files/auto2735-ivt-mcp_nand/partition_nand.xml
+++ b/meta/meta-mediatek-mt2735/recipes-bsp/scatter/files/auto2735-ivt-mcp_nand/partition_nand.xml
@@ -20,23 +20,23 @@
<entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="114048" end="134527" name="md1img_b" />
<entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="134528" end="137087" name="md1dsp_a" />
<entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="137088" end="139647" name="md1dsp_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="139648" end="139903" name="misc" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="139904" end="140223" name="tee_a" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="140224" end="140543" name="tee_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="140544" end="140799" name="mcupm_a" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="140800" end="141055" name="mcupm_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141056" end="141311" name="sspm_a" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141312" end="141567" name="sspm_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141568" end="141823" name="dpm_a" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141824" end="142079" name="dpm_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142080" end="142335" name="medmcu_a" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142336" end="142591" name="medmcu_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142592" end="142719" name="vbmeta_a" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142720" end="142847" name="vbmeta_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142848" end="142975" name="bl2_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142976" end="143167" name="bl33_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="143168" end="143231" name="hsm_os_b" />
- <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="143232" end="148735" name="expdb" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="139648" end="139903" name="mcupm_a" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="139904" end="140159" name="mcupm_b" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="140160" end="140415" name="sspm_a" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="140416" end="140671" name="sspm_b" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="140672" end="140927" name="dpm_a" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="140928" end="141183" name="dpm_b" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141184" end="141439" name="medmcu_a" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141440" end="141695" name="medmcu_b" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141696" end="141823" name="vbmeta_a" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141824" end="141951" name="vbmeta_b" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="141952" end="142079" name="bl2_b" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142080" end="142271" name="bl33_b" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142272" end="142335" name="hsm_os_b" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="142336" end="147839" name="expdb" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="147840" end="148095" name="misc" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="148096" end="148415" name="tee_a" />
+ <entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="148416" end="148735" name="tee_b" />
<entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="148736" end="156927" name="nvram" />
<entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="156928" end="165119" name="userdata" />
<entry type="{0FC63DAF-8483-4772-8E79-3D69D8477DE4}" start="165120" end="261439" name="log" />
diff --git a/meta/meta-mediatek-mt2735/recipes-core/initial/files/init_mount_nand b/meta/meta-mediatek-mt2735/recipes-core/initial/files/init_mount_nand
index 4276246..87d5fcb 100755
--- a/meta/meta-mediatek-mt2735/recipes-core/initial/files/init_mount_nand
+++ b/meta/meta-mediatek-mt2735/recipes-core/initial/files/init_mount_nand
@@ -161,7 +161,7 @@
cd /dev/disk/by-partlabel
ln -s ../../mtd6 hsm_bl
ln -s ../../mtd7 hsm_os_a
- ln -s ../../mtd35 hsm_os_b
+ ln -s ../../mtd32 hsm_os_b
ln -s ../../mtd8 boot_para
ln -s ../../mtd9 protect_a
ln -s ../../mtd10 protect_b
@@ -173,24 +173,24 @@
ln -s ../../mtd17 md1img_b
ln -s ../../mtd18 md1dsp_a
ln -s ../../mtd19 md1dsp_b
- ln -s ../../mtd20 misc
- ln -s ../../mtd21 tee_a
- ln -s ../../mtd22 tee_b
- ln -s ../../mtd30 vbmeta_a
- ln -s ../../mtd31 vbmeta_b
- ln -s ../../mtd36 expdb
+ ln -s ../../mtd34 misc
+ ln -s ../../mtd35 tee_a
+ ln -s ../../mtd36 tee_b
+ ln -s ../../mtd28 vbmeta_a
+ ln -s ../../mtd29 vbmeta_b
+ ln -s ../../mtd33 expdb
ln -s ../../mtd0 bl2_a
- ln -s ../../mtd33 bl2_b
+ ln -s ../../mtd30 bl2_b
ln -s ../../mtd1 bl33_a
- ln -s ../../mtd34 bl33_b
- ln -s ../../mtd23 mcupm_a
- ln -s ../../mtd24 mcupm_b
- ln -s ../../mtd25 sspm_a
- ln -s ../../mtd26 sspm_b
- ln -s ../../mtd27 dpm_a
- ln -s ../../mtd28 dpm_b
- ln -s ../../mtd29 medmcu_a
- ln -s ../../mtd30 medmcu_b
+ ln -s ../../mtd31 bl33_b
+ ln -s ../../mtd20 mcupm_a
+ ln -s ../../mtd21 mcupm_b
+ ln -s ../../mtd22 sspm_a
+ ln -s ../../mtd23 sspm_b
+ ln -s ../../mtd24 dpm_a
+ ln -s ../../mtd25 dpm_b
+ ln -s ../../mtd26 medmcu_a
+ ln -s ../../mtd27 medmcu_b
ln -s ../../mtd2 spm_a
ln -s ../../mtd3 spm_b
diff --git a/update_version.sh b/update_version.sh
index 44f3e26..b54ca69 100644
--- a/update_version.sh
+++ b/update_version.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LYNQ_SW_INSIDE_VERSION="LYNQ_CONFIG_VERSION = \"T800_v02.MP1_MR3.03b00.00.01\""
-LYNQ_SW_VERSION="LYNQ_CONFIG_SW_VERSION = \"T800_v02.MP1_MR3.03b00.00.01\""
+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\""
COMMIT_ID="$(git rev-parse --short HEAD)"
LYNQ_COMMITID="LYNQ_CONFIG_COMMITID = \"${COMMIT_ID}\""