Use build mkfs_f2fs instead of mkfs.f2fs to align to NXP

varigit · Jun 27, 2023 · 48972b8 · 48972b8
1 parent 0c4530e
commit 48972b8
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/scripts/sh/var-mksdcard.sh b/scripts/sh/var-mksdcard.sh
@@ -49,10 +49,13 @@ help() {
 
 function rename_remoteproc_images {
 	if [[ "$1" == *"imx8mp-var-som"* ]]; then
+		cp -ar device/variscite/imx8m/dart_mx8mp/*.bin.debug ${imagesdir}
 		cp ${imagesdir}/${mcu_os_demo_file_8mp_som}	${imagesdir}/${mcu_os_demo_file}
 	elif [[ "$1" == *"imx8mp-var-dart"* ]]; then
+		cp -ar device/variscite/imx8m/dart_mx8mp/*.bin.debug ${imagesdir}
 		cp ${imagesdir}/${mcu_os_demo_file_8mp_dart}	${imagesdir}/${mcu_os_demo_file}
 	elif [[ "$1" == *"imx8mq-var-dart"* ]]; then
+		cp -ar device/variscite/imx8m/dart_mx8mq/*.bin.debug ${imagesdir}
 		cp ${imagesdir}/${mcu_os_demo_file_8mq_dart}	${imagesdir}/${mcu_os_demo_file}
 	fi
 }
@@ -446,23 +449,23 @@ function format_android
 		blue_underlined_bold_echo "Erasing metadata partition"
 		dd if=/dev/zero of=${node}${part}8 bs=1M count=${METADATA_SIZE} conv=fsync
 		blue_underlined_bold_echo "Formating userdata partition"
-		mkfs.f2fs -F ${node}${part}14 -Ldata
+		out/host/linux-x86/bin/make_f2fs -f -g android ${node}${part}14 -l userdata
 	else
 		blue_underlined_bold_echo "Erasing presistdata partition"
-		dd if=/dev/zero of=${node}${part}11 bs=1M count=${PRESISTDATA_SIZE} conv=fsync
+		dd if=/dev/zero of=${node}${part}11 bs=1M count=${PRESISTDATA_SIZE} conv=fsync,nocreat
 
 		blue_underlined_bold_echo "Erasing fbmisc partition"
-		dd if=/dev/zero of=${node}${part}15 bs=1M count=${FBMISC_SIZE} conv=fsync
+		dd if=/dev/zero of=${node}${part}15 bs=1M count=${FBMISC_SIZE} conv=fsync,nocreat
 
 		blue_underlined_bold_echo "Erasing misc partition"
-		dd if=/dev/zero of=${node}${part}9 bs=1M count=${MISC_SIZE} conv=fsync
+		dd if=/dev/zero of=${node}${part}9 bs=1M count=${MISC_SIZE} conv=fsync,nocreat
 
 		blue_underlined_bold_echo "Erasing metadata partition"
-		dd if=/dev/zero of=${node}${part}10 bs=1M count=${METADATA_SIZE} conv=fsync
-		mkfs.f2fs -f ${node}${part}10 -l metadata
+		dd if=/dev/zero of=${node}${part}10 bs=1M count=${METADATA_SIZE} conv=fsync,nocreat
+		out/host/linux-x86/bin/make_f2fs -f -g android ${node}${part}10 -l metadata
 
 		blue_underlined_bold_echo "Formating userdata partition"
-		mkfs.f2fs -f ${node}${part}13 -l data
+		out/host/linux-x86/bin/make_f2fs -f -g android ${node}${part}13 -l userdata
 
 		if [[ "${soc_name}" = *"mx8qm"* ]]; then
 			blue_underlined_bold_echo "Formating firmware partition"