dipcore · Thedemon007 · Mar 21, 2019 · Mar 31, 2019 · Mar 31, 2019 · Feb 15, 2020
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,42 @@
+#
+# NOTE! Don't add files that are generated in specific
+# subdirectories here. Add them in the ".gitignore" file
+# in that subdirectory instead.
+#
+# NOTE! Please use 'git ls-files -i --exclude-standard'
+# command after changing this file, to see if there are
+# any tracked files which get ignored after the change.
+#
+# Normal rules
+#
+.*
+*.o
+*.o.*
+*.a
+*.s
+*.bin
+*.tar
+*.gz
+*.bz2
+*.lzma
+*.xz
+*.lz4
+*.lzo
+*.patch
+*.c.[012]*.*
+
+#
+# Unpacked directory
+#
+/unpacked/
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+#
+# git files that we don't want to ignore even if they are dot-files
+#
+!.gitignore
+!.mailmap
+!.cocciconfig
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/android-simg2img"]
+	path = src/android-simg2img
+	url = https://github.com/anestisb/android-simg2img
diff --git a/README.md b/README.md
@@ -3,12 +3,37 @@
 Command line tools to pack/unpack MStar bin firmware
 
 Currently available tools:
+ - **extract.py** - unpack MStar bin firmware and extract file from *.img files to directory
+ - **extract.sh** - unpack MStar bin firmware and mount *.img files to directory
  - **unpack.py** - unpack MStar bin firmware
  - **pack.py** - pack MStar bin firmware
  - **extract_keys.py** - extract AES and RSA-public keys from MBOOT binary
  - **secure_partition.py** - encrypt image and generate signature file
 
 
+## unpack MStar bin firmware and extract file from *.img files to directory
+
+```
+Usage: extract.py <firmware> <output folder [default: ./unpacked/]>
+        <firmware> - MStar bin firmware to unpack
+        <output folder> - directory to store unpacked stuff. Default value: ./unpacked/
+```
+
+## Unpack MStar bin firmware files and mount *.img to directory
+
+```
+Usage: extract.sh <firmware> <output folder [default: ./unpacked/]>
+        <firmware> - MStar bin firmware to unpack
+        <output folder> - directory to store unpacked stuff. Default value: ./unpacked/
+```
+
+## Umount directory
+
+```
+Usage: extract.sh umount <output folder [default: ./unpacked/]>
+        <output folder> - directory to store unpacked stuff. Default value: ./unpacked/
+```
+
 ## Unpack MStar bin firmware files
 
 ```

diff --git a/__pycache__/utils.cpython-37.pyc b/__pycache__/utils.cpython-37.pyc
diff --git a/bin/linux-x86/img2simg b/bin/linux-x86/img2simg
diff --git a/bin/linux-x86/simg2img b/bin/linux-x86/simg2img
diff --git a/bin/linux-x86/simg2simg b/bin/linux-x86/simg2simg
diff --git a/bin/sparse/cygwin1.dll b/bin/sparse/cygwin1.dll
diff --git a/bin/sparse/cygz.dll b/bin/sparse/cygz.dll
diff --git a/bin/sparse/img2simg.exe b/bin/sparse/img2simg.exe
diff --git a/bin/sparse/simg2img.exe b/bin/sparse/simg2img.exe
diff --git a/bin/sparse/simg2simg.exe b/bin/sparse/simg2simg.exe
diff --git a/bin/win32/7z.dll b/bin/win32/7z.dll
diff --git a/bin/win32/7z.exe b/bin/win32/7z.exe
diff --git a/bin/win32/SubSecureInfoGen.exe b/bin/win32/SubSecureInfoGen.exe
diff --git a/configs/command-example.ini b/configs/command-example.ini
@@ -0,0 +1,33 @@
+#With 'command' key in any 'part' section you can add any command right after the patition writing commands.
+#Usually it's done to set environment variables.
+#Number of command lines isn't limited.
+
+[Main]
+FirmwareFileName=example.bin
+ProjectFolder=./pack
+useHexValuesPrefix=true
+SCRIPT_FIRMWARE_FILE_NAME=$$(UpgradeImage)
+DRAM_BUF_ADDR=55000000
+MAGIC_FOOTER=12345678
+HEADER_SIZE=16KB
+
+[HeaderScript]
+Label:	\#-------------USB Upgrade Bin Info----------------
+
+Prefix: 
+
+Suffix:	
+
+[part/recovery]
+erase=True
+imageFile=${Main:ProjectFolder}/recovery.img
+type=partitionImage
+command=setenv recoverycmd mmc read.p 0x23000000 dtb 0x00100000\; mmc read.p 0x25000000 recovery 0x02000000\; bootm 0x25000000
+		saveenv
+
+[part/boot]
+erase=True
+imageFile=${Main:ProjectFolder}/boot.img
+type=partitionImage
+command=setenv bootcmd mmc read.p 0x23000000 dtb 0x00100000\; mmc read.p 0x25000000 boot 0x02000000\; bootm 0x25000000
+		saveenv
diff --git a/configs/label-example.ini b/configs/label-example.ini
@@ -0,0 +1,32 @@
+# 
+# Example of using customized Label for your firmware. 
+# If Label variable is specified in the HeaderScript section then the default label will be replaced by yours.
+# Sometimes it could be nesessary because the installer checks the label for the device name and the timestamp as Xgimi does.
+# 
+
+[Main]
+FirmwareFileName=GIMI_XHAD01_XHC05_MAXIM_YN_WMP.bin
+ProjectFolder=./pack
+useHexValuesPrefix=true
+
+SCRIPT_FIRMWARE_FILE_NAME=$$(UpgradeImage)
+DRAM_BUF_ADDR=20200000
+MAGIC_FOOTER=12345678
+HEADER_SIZE=16KB
+#CRC_TYPE = [NORMAL, XGIMI, PB803]. For details see comments in pack.py file 
+CRC_TYPE=XGIMI
+
+[HeaderScript]
+Label: \#-------------USB Upgrade Bin Info----------------
+	   \# Device : synsepalum_YN
+       \# Build PATH : /home/xgimi-dev/jenkins_node/workspace/838_H2/47_2019-07-27-172032_v1.12.36/android
+       \# Build TIME : {time:%Y-%m-%d %H:%M:%S}
+       \# Build TIME STAMP : {timestamp:d}
+
+Prefix:
+
+Suffix:
+	setenv MstarUpgrade_complete 1
+	setenv ResetAfterUpgrade 1
+	setenv ForcePowerOn 0
+	saveenv
diff --git a/configs/multi2optee-example.ini b/configs/multi2optee-example.ini
@@ -0,0 +1,28 @@
+#Use 'type=multi2optee' key in the 'part' section to write partition with 'multi2optee' command.
+
+[Main]
+FirmwareFileName=example.bin
+ProjectFolder=./pack
+useHexValuesPrefix=true
+SCRIPT_FIRMWARE_FILE_NAME=$$(UpgradeImage)
+DRAM_BUF_ADDR=55000000
+MAGIC_FOOTER=12345678
+HEADER_SIZE=16KB
+
+[HeaderScript]
+Label:	\#-------------USB Upgrade Bin Info----------------
+
+Prefix: 
+
+Suffix:	
+
+[part/optee]
+imageFile=${Main:ProjectFolder}/optee.bin
+type=multi2optee
+erase=true
+command=setenv MMAP_ONE_BIN_SUPPORT 1
+
+[part/armfw]
+imageFile=${Main:ProjectFolder}/armfw.bin
+type=multi2optee
+erase=true
diff --git a/configs/xgimi.ini b/configs/xgimi.ini
@@ -7,7 +7,8 @@ SCRIPT_FIRMWARE_FILE_NAME=${FirmwareFileName}
 DRAM_BUF_ADDR=20200000
 MAGIC_FOOTER=12345678
 HEADER_SIZE=16KB
-USE_XGIMI_CRC2=True
+#CRC_TYPE = [NORMAL, XGIMI, PB803]. For details see comments in pack.py file 
+CRC_TYPE=XGIMI
 
 [HeaderScript]
 Prefix:

diff --git a/extract.py b/extract.py
@@ -0,0 +1,38 @@
+import sys
+import os
+import re
+import shutil
+import subprocess
+
+import utils
+
+# Vars
+DEBUG = False
+
+# Parse args
+if len(sys.argv) == 1: 
+	print ("Usage: extract.py <firmware> <output folder [default: ./unpacked/]>")
+	quit()
+
+inputFile = sys.argv[1]
+if not os.path.exists(inputFile):
+	print ("No such file: {}".format(inputFile))
+	quit()
+
+if len(sys.argv) == 3:
+	outputDirectory = sys.argv[2]
+else:
+	outputDirectory = 'unpacked'
+
+subprocess.run("unpack.py {} {}".format(inputFile, outputDirectory), shell=True)
+
+if not os.path.exists(outputDirectory):
+	print ("No such folder: {}".format(outputDirectory))
+	quit()
+
+files = os.listdir(outputDirectory) 
+images = filter(lambda x: x.endswith('.img'), files)
+for img in images:
+	path = os.path.join(outputDirectory, os.path.splitext(img)[0])
+	os.mkdir(path)
+	utils.unpackImg(os.path.join(outputDirectory, img), path)
diff --git a/extract.sh b/extract.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+usage()
+{
+  echo "Usage: extract.sh <firmware> <output folder [default: ./unpacked/]>"
+  echo "Usage: extract.sh umount <output folder [default: ./unpacked/]>"
+  exit 1
+}
+
+main()
+{
+  local UNPACK_DIR="unpacked"
+
+  if [ $# -lt 1 ]; then
+    usage
+  fi
+
+  local FIRMWARE=$1
+  if [ $# -ge 2 ]; then
+    UNPACK_DIR=$2
+  fi
+
+  if [ "$1" = "umount" ]; then
+    cd "$UNPACK_DIR"
+    for file in *.img; do
+      folder="${file%%.*}"
+      sudo umount "${folder}"
+    done
+    cd ..
+    exit 0
+  fi
+
+  python3 unpack.py "$FIRMWARE" "$UNPACK_DIR"
+
+  cd "$UNPACK_DIR"
+  for file in *.img; do
+    folder="${file%%.*}"
+    mkdir "${folder}"
+    sudo mount "${file}" "${folder}" -o loop
+  done
+  cd ..
+}
+
+main $*
+