Merge "[Feature][T108][GNSS][task-view-1684]Compatible with HD8040" into GSW_V1453
diff --git a/marvell/swd/FACT/asr1806_p301_QSPINAND_Trusted_TOS_SDTIM_LPDDR2_AB_MBTK.blf b/marvell/swd/FACT/asr1806_p301_QSPINAND_Trusted_TOS_SDTIM_LPDDR2_AB_MBTK.blf
index e2e0cbe..5ce2fc1 100755
--- a/marvell/swd/FACT/asr1806_p301_QSPINAND_Trusted_TOS_SDTIM_LPDDR2_AB_MBTK.blf
+++ b/marvell/swd/FACT/asr1806_p301_QSPINAND_Trusted_TOS_SDTIM_LPDDR2_AB_MBTK.blf
@@ -21,7 +21,7 @@
 Reset_BBT = 0

 AB_System = 2

 [TIM_Configuration]

-Number_of_Images = 24

+Number_of_Images = 25

 Number_of_Keys = 0

 WTM_Save_State_Flash_Signature = 0x4D4D4308

 WTM_Save_State_Flash_Entry_Address = 0x00000000

@@ -2375,7 +2375,7 @@
 24_Image_Enable = 1

 24_Image_Tim_Included = 3

 24_Image_Image_ID = 0x4F454D4E

-24_Image_Next_Image_ID = 0x54494D31

+24_Image_Next_Image_ID = 0x4F454D55

 24_Image_Path = oemapp.ubi

 24_Image_Flash_Entry_Address = 0x0F100000

 24_Image_Load_Address = 0xFFFFFFFF

@@ -2387,6 +2387,19 @@
 24_Image_Image_Size_To_Hash_in_bytes = 0xFFFFFFFF

 24_Image_Stim_Size = 0x40000

 24_Image_Stim_Config = 0

+25_Image_Enable = 0

+25_Image_Tim_Included = 0

+25_Image_Image_ID = 0x4F454D55

+25_Image_Next_Image_ID = 0xFFFFFFFF

+25_Image_Path = oemdata.ubi

+25_Image_Flash_Entry_Address = 0x15500000

+25_Image_Load_Address = 0xFFFFFFFF

+25_Image_Type = RAW

+25_Image_ID_Name = OEMDATA

+25_Image_Erase_Size = 0x05000000

+25_Image_Partition_Number = 0

+25_Image_Hash_Algorithm_ID = SHA-256

+25_Image_Image_Size_To_Hash_in_bytes = 0xFFFFFFFF

 [Nand_Images_list_Property]

 1_NandSign_Value = 0x5350491A

 1_NandSign_NandIdNumber = 1

diff --git a/pack.sh b/pack.sh
index f284470..f8d4f92 100755
--- a/pack.sh
+++ b/pack.sh
@@ -365,6 +365,9 @@
 	if [ "$SEC_SUPPORT" == "N" ];then
 		sed -i 's/Number_of_Images = 15/Number_of_Images = 14/g' ../$MBTK_M1901_VERSION_DIR/"$BUILD_TARGAT"_"$BUILD_FLAG"_QSPINAND_Trusted_SDTIM_LPDDR2_OTA_BLF
 		sed -i 's/23_Image_Enable = 0/23_Image_Enable = 1/g' ../$MBTK_M1901_VERSION_DIR/"$BUILD_TARGAT"_"$BUILD_FLAG"_QSPINAND_Trusted_SDTIM_LPDDR2_AB_MBTK.blf
+	else
+		sed -i 's/Number_of_Images = 16/Number_of_Images = 15/g' ../$MBTK_M1901_VERSION_DIR/"$BUILD_TARGAT"_"$BUILD_FLAG"_QSPINAND_Trusted_SDTIM_LPDDR2_OTA_BLF
+		sed -i 's/25_Image_Enable = 0/25_Image_Enable = 1/g' ../$MBTK_M1901_VERSION_DIR/"$BUILD_TARGAT"_"$BUILD_FLAG"_QSPINAND_Trusted_SDTIM_LPDDR2_AB_MBTK.blf
 	fi	
 	zip -q -r $MBTK_M1901_VERSION.zip $MBTK_M1901_VERSION
 	cd $CUR_PWD