[Feature][T108][task-view-1644] fix oemapp and oemdata name
Only Configure: No
Affected branch: GSW_V1453
Affected module: SDK
Is it affected on IC: only ASR
Self-test: yes
Doc Update: no
Change-Id: I99b9dd972ee4441cfbb06e148be43a9ab34ec362
diff --git a/marvell/swd/FACT/asr1806_p301_QSPINAND_Trusted_SDTIM_LPDDR2_AB_MBTK.blf b/marvell/swd/FACT/asr1806_p301_QSPINAND_Trusted_SDTIM_LPDDR2_AB_MBTK.blf
index a7dcbf8..f778f23 100644
--- a/marvell/swd/FACT/asr1806_p301_QSPINAND_Trusted_SDTIM_LPDDR2_AB_MBTK.blf
+++ b/marvell/swd/FACT/asr1806_p301_QSPINAND_Trusted_SDTIM_LPDDR2_AB_MBTK.blf
@@ -2333,7 +2333,7 @@
21_Image_Tim_Included = 2
21_Image_Image_ID = 0x4F454D4E
21_Image_Next_Image_ID = 0x4F454D4E
-21_Image_Path = openwrt-mmp-asr1806-oemapp.ubi
+21_Image_Path = oemapp.ubi
21_Image_Flash_Entry_Address = 0x08D00000
21_Image_Load_Address = 0xFFFFFFFF
21_Image_Type = RAW
@@ -2348,7 +2348,7 @@
22_Image_Tim_Included = 3
22_Image_Image_ID = 0x4F454D4E
22_Image_Next_Image_ID = 0x4F454D55
-22_Image_Path = openwrt-mmp-asr1806-oemapp.ubi
+22_Image_Path = oemapp.ubi
22_Image_Flash_Entry_Address = 0x0F100000
22_Image_Load_Address = 0xFFFFFFFF
22_Image_Type = RAW
@@ -2363,11 +2363,11 @@
23_Image_Tim_Included = 0
23_Image_Image_ID = 0x4F454D55
23_Image_Next_Image_ID = 0xFFFFFFFF
-23_Image_Path = openwrt-mmp-asr1806-oemdata.ubi
+23_Image_Path = oemdata.ubi
23_Image_Flash_Entry_Address = 0x15500000
23_Image_Load_Address = 0xFFFFFFFF
23_Image_Type = RAW
-23_Image_ID_Name = DEV
+23_Image_ID_Name = OEMDATA
23_Image_Erase_Size = 0x05000000
23_Image_Partition_Number = 0
23_Image_Hash_Algorithm_ID =
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 a9e2076..1c91b7d 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
@@ -2361,7 +2361,7 @@
23_Image_Tim_Included = 2
23_Image_Image_ID = 0x4F454D4E
23_Image_Next_Image_ID = 0x4F454D4E
-23_Image_Path = openwrt-mmp-asr1806-oemapp.ubi
+23_Image_Path = oemapp.ubi
23_Image_Flash_Entry_Address = 0x08D00000
23_Image_Load_Address = 0xFFFFFFFF
23_Image_Type = RAW
@@ -2376,7 +2376,7 @@
24_Image_Tim_Included = 3
24_Image_Image_ID = 0x4F454D4E
24_Image_Next_Image_ID = 0x54494D31
-24_Image_Path = openwrt-mmp-asr1806-oemapp.ubi
+24_Image_Path = oemapp.ubi
24_Image_Flash_Entry_Address = 0x0F100000
24_Image_Load_Address = 0xFFFFFFFF
24_Image_Type = RAW
diff --git a/pack.sh b/pack.sh
index 7cfab5b..19492a1 100755
--- a/pack.sh
+++ b/pack.sh
@@ -321,7 +321,7 @@
copy openwrt-mmp-"$BUILD_TARGAT"-u-boot.bin
copy openwrt-mmp-"$BUILD_TARGAT"-zImage
copy openwrt-mmp-"$BUILD_TARGAT"-root.squashfs
- copy openwrt-mmp-"$BUILD_TARGAT"-oemapp.ubi
+ copy oemapp.ubi
copy DTim.Primary
copy DTim.PPsetting
copy DTim.PPsetting2
@@ -373,4 +373,9 @@
else
copy_bin_1806
fi
+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
+fi
+
diff --git a/target/linux/mmp/image/Makefile b/target/linux/mmp/image/Makefile
index 28e91a2..8129428 100755
--- a/target/linux/mmp/image/Makefile
+++ b/target/linux/mmp/image/Makefile
@@ -509,7 +509,7 @@
-o $(KDIR)/oemapp.ubi \
ubinize-oemapp.cfg \
)
- $(CP) $(KDIR)/oemapp.ubi $(BIN_DIR)/swd/$(IMG_PREFIX)-oemapp.ubi
+ $(CP) $(KDIR)/oemapp.ubi $(BIN_DIR)/swd/oemapp.ubi
endif
endef
#LYNQ_MODFIY_END for gsw oemapp