summaryrefslogtreecommitdiff
path: root/installer
diff options
context:
space:
mode:
Diffstat (limited to 'installer')
-rw-r--r--installer/hikey/README38
-rw-r--r--installer/hikey/fip.binbin1188200 -> 0 bytes
-rwxr-xr-xinstaller/hikey/flash-all.sh81
-rw-r--r--installer/hikey/hisi-idt.py263
-rw-r--r--installer/hikey/l-loader.binbin136192 -> 0 bytes
-rw-r--r--installer/hikey/nvme.imgbin131072 -> 0 bytes
-rw-r--r--installer/hikey/ptable-aosp-4g.imgbin17408 -> 0 bytes
-rw-r--r--installer/hikey/ptable-aosp-8g.imgbin17408 -> 0 bytes
-rw-r--r--installer/hikey960/fip.binbin1518080 -> 0 bytes
-rwxr-xr-xinstaller/hikey960/flash-all.sh94
-rw-r--r--installer/hikey960/hisi-bl31.binbin148968 -> 0 bytes
-rw-r--r--installer/hikey960/hisi-fastboot.imgbin3426304 -> 0 bytes
-rw-r--r--installer/hikey960/hisi-lpm3.imgbin217344 -> 0 bytes
-rw-r--r--installer/hikey960/hisi-nvme.imgbin131072 -> 0 bytes
-rw-r--r--installer/hikey960/hisi-ptable.imgbin200704 -> 0 bytes
-rw-r--r--installer/hikey960/hisi-sec_xloader.imgbin154752 -> 0 bytes
-rw-r--r--installer/hikey960/l-loader.binbin25701 -> 0 bytes
-rwxr-xr-xinstaller/hikey960/mkdtimg159
-rw-r--r--installer/hikey960/prm_ptable.imgbin24576 -> 0 bytes
-rwxr-xr-xinstaller/hikey960/uefi-flash-all.sh76
20 files changed, 78 insertions, 633 deletions
diff --git a/installer/hikey/README b/installer/hikey/README
deleted file mode 100644
index b58cd96a..00000000
--- a/installer/hikey/README
+++ /dev/null
@@ -1,38 +0,0 @@
-These instruction should help you in flashing the bootloader
-and AOSP images built from sources.
-Detailed instructions on how to setup the Board can be found
-here:
-https://github.com/96boards/documentation/wiki/HiKeyGettingStarted
-
-For flashing the bootloader, the top two links should be installed
-(closed) and the 3rd link should be removed (open):
-
----------------------------------------------------------
-| Name | Link | State |
-| Auto Power up | Link 1-2 | closed |
-| Boot Select | Link 3-4 | closed |
-| GPIO3-1 | Link 5-6 | open |
----------------------------------------------------------
-
-Link 1-2 causes HiKey to auto-power up when power is installed. Link
-3-4 causes the HiKey SoC internal ROM to start up in at a special
-"install bootloader" mode which will install a supplied bootloader
-from the microUSB OTG port into RAM, and will present itself to a
-connected PC as a ttyUSB device.
-
-Note: The HiKey board will remain in USB load mode for 90 seconds
-from power up. If you take longer than 90 seconds to start the install
-then power cycle the board before trying again.
-
-Wait about 5 seconds and then check that the HiKey board has been
-recognized by your Linux PC:
-$ ls /dev/ttyUSB*
-or
-$ dmesg
-
-
-Run the flash-all.sh script after building AOSP for hikey with the right
-right UART recognised in the above command:
-$ ./flash-all.sh /dev/ttyUSBX [4g]
-
-Remove the link 3-4 and power on the board.
diff --git a/installer/hikey/fip.bin b/installer/hikey/fip.bin
deleted file mode 100644
index e388d9ec..00000000
--- a/installer/hikey/fip.bin
+++ /dev/null
Binary files differ
diff --git a/installer/hikey/flash-all.sh b/installer/hikey/flash-all.sh
deleted file mode 100755
index 4707d063..00000000
--- a/installer/hikey/flash-all.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-if [ $# -eq 0 ]
- then
- echo "Provide the right /dev/ttyUSBX specific to recovery device"
- exit
-fi
-
-if [ ! -e "${1}" ]
- then
- echo "device: ${1} does not exist"
- exit
-fi
-DEVICE_PORT="${1}"
-PTABLE=ptable-aosp-8g.img
-if [ $# -gt 1 ]
- then
- if [ "${2}" == '4g' ]
- then
- PTABLE=ptable-aosp-4g.img
- fi
-fi
-
-INSTALLER_DIR="`dirname ${0}`"
-FIRMWARE_DIR="${INSTALLER_DIR}"
-
-# for cases that not run "lunch hikey-userdebug"
-if [ -z "${ANDROID_BUILD_TOP}" ]; then
- ANDROID_BUILD_TOP=${INSTALLER_DIR}/../../../../../
- ANDROID_PRODUCT_OUT="${ANDROID_BUILD_TOP}/out/target/product/hikey"
-fi
-
-if [ -z "${DIST_DIR}" ]; then
- DIST_DIR="${ANDROID_BUILD_TOP}"/out/dist
-fi
-
-#get out directory path
-while [ $# -ne 0 ]; do
- case "${1}" in
- --out) OUT_IMGDIR=${2};shift;;
- --use-compiled-binaries) FIRMWARE_DIR="${DIST_DIR}";shift;;
- esac
- shift
-done
-
-if [[ "${FIRMWARE_DIR}" == "${DIST_DIR}" && ! -e "${DIST_DIR}"/fip.bin && ! -e "${DIST_DIR}"/l-loader.bin ]]; then
- echo "No binaries found at ${DIST_DIR}. Please build the bootloader first"
- exit
-fi
-
-if [ -z "${OUT_IMGDIR}" ]; then
- if [ ! -z "${ANDROID_PRODUCT_OUT}" ]; then
- OUT_IMGDIR="${ANDROID_PRODUCT_OUT}"
- fi
-fi
-
-if [ ! -d "${OUT_IMGDIR}" ]; then
- echo "error in locating out directory, check if it exist"
- exit
-fi
-
-echo "android out dir:${OUT_IMGDIR}"
-
-sudo python "${INSTALLER_DIR}"/hisi-idt.py --img1="${FIRMWARE_DIR}"/l-loader.bin -d "${DEVICE_PORT}"
-sleep 3
-# set a unique serial number
-serialno=`fastboot getvar serialno 2>&1 > /dev/null`
-if [ "${serialno:10:6}" == "(null)" ]; then
- fastboot oem serialno
-else
- if [ "${serialno:10:15}" == "0123456789abcde" ]; then
- fastboot oem serialno
- fi
-fi
-fastboot getvar partition-size:ptable
-fastboot flash ptable "${INSTALLER_DIR}"/"${PTABLE}"
-fastboot flash fastboot "${FIRMWARE_DIR}"/fip.bin
-fastboot flash nvme "${INSTALLER_DIR}"/nvme.img
-fastboot flash boot "${OUT_IMGDIR}"/boot.img
-fastboot flash system "${OUT_IMGDIR}"/system.img
-fastboot flash vendor "${OUT_IMGDIR}"/vendor.img
-fastboot flash userdata "${OUT_IMGDIR}"/userdata.img
diff --git a/installer/hikey/hisi-idt.py b/installer/hikey/hisi-idt.py
deleted file mode 100644
index db66ef88..00000000
--- a/installer/hikey/hisi-idt.py
+++ /dev/null
@@ -1,263 +0,0 @@
-#!/usr/bin/env python
-#-*- coding: utf-8 -*-
-
-import os
-import os.path
-
-import serial, time
-import array
-import sys, getopt
-
-class bootdownload(object):
- '''
- Hisilicon boot downloader
-
- >>> downloader = bootdownload()
- >>> downloader.download(filename)
-
- '''
-
- # crctab calculated by Mark G. Mendel, Network Systems Corporation
- crctable = [
- 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
- 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
- 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
- 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
- 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
- 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
- 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4,
- 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
- 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823,
- 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
- 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12,
- 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
- 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41,
- 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
- 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70,
- 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
- 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
- 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
- 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
- 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
- 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
- 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
- 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
- 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
- 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
- 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3,
- 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
- 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92,
- 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
- 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1,
- 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
- 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0,
- ]
-
- startframe = {
- 'hi3716cv200':[0xFE,0x00,0xFF,0x01,0x00,0x00,0x00,0x04,0x00,0x00,0x02,0x01]
- }
-
- headframe = {
- 'hi3716cv200':[0xFE,0x00,0xFF,0x01,0x00,0x00,0x00,0x04,0x00,0x00,0x02,0x01]
- }
-
- bootheadaddress = {
- 'hi3716cv200':0xF9800800
- }
-
- bootdownloadaddress = {
- 'hi3716cv200':0x07000000
- }
-
- BOOT_HEAD_LEN = 0x4F00
- MAX_DATA_LEN = 0x400
-
- def __init__(self,chiptype,serialport):
- try:
- self.s = serial.Serial(port=serialport, baudrate=115200, timeout=1)
- except serial.serialutil.SerialException:
- #no serial connection
- self.s = None
- print "\nFailed to open serial!", serialport
- sys.exit(2)
-
- self.chip = chiptype
-
- def __del__(self):
- if self.s != None:
- self.s.close()
-
- def calc_crc(self, data, crc=0):
- for char in data:
- crc = ((crc << 8) | ord(char)) ^ self.crctable[(crc >> 8) & 0xff]
- for i in range(0,2):
- crc = ((crc << 8) | 0) ^ self.crctable[(crc >> 8) & 0xff]
- return crc & 0xffff
-
- def getsize(self, filename):
- st = os.stat(filename)
- return st.st_size
-
- def sendframe(self, data, loop):
- for i in range(1, loop):
- self.s.flushOutput()
- self.s.write(data)
- self.s.flushInput()
- try:
- ack = self.s.read()
- if len(ack) == 1:
- if ack == chr(0xaa):
- return None
- except:
- return None
-
- print 'failed'
-
- def sendstartframe(self):
- self.s.timeout = 0.01
- data = array.array('B', self.startframe[self.chip]).tostring()
- crc = self.calc_crc(data)
- data += chr((crc >> 8)&0xff)
- data += chr(crc&0xff)
- self.sendframe(data,10000)
-
- def sendheadframe(self,length,address):
- self.s.timeout = 0.03
- self.headframe[self.chip][4] = (length>>24)&0xff
- self.headframe[self.chip][5] = (length>>16)&0xff
- self.headframe[self.chip][6] = (length>>8)&0xff
- self.headframe[self.chip][7] = (length)&0xff
- self.headframe[self.chip][8] = (address>>24)&0xff
- self.headframe[self.chip][9] = (address>>16)&0xff
- self.headframe[self.chip][10] = (address>>8)&0xff
- self.headframe[self.chip][11] = (address)&0xff
-
- data = array.array('B', self.headframe[self.chip]).tostring()
- crc = self.calc_crc(data)
-
- data += chr((crc >> 8)&0xff)
- data += chr(crc&0xff)
-
- self.sendframe(data,16)
-
-
- def senddataframe(self,seq,data):
- self.s.timeout = 0.15
- head = chr(0xDA)
- head += chr(seq&0xFF)
- head += chr((~seq)&0xFF)
-
- data = head + data
-
- crc = self.calc_crc(data)
- data += chr((crc >> 8)&0xff)
- data += chr(crc&0xff)
-
- self.sendframe(data,32)
-
- def sendtailframe(self,seq):
- data = chr(0xED)
- data += chr(seq&0xFF)
- data += chr((~seq)&0xFF)
- crc = self.calc_crc(data)
- data += chr((crc >> 8)&0xff)
- data += chr(crc&0xff)
-
- self.sendframe(data,16)
-
- def senddata(self, data, address):
- length=len(data)
- self.sendheadframe(length,address)
- seq=1
- while length > self.MAX_DATA_LEN:
- self.senddataframe(seq,data[(seq-1)*self.MAX_DATA_LEN:seq*self.MAX_DATA_LEN])
- seq = seq+1
- length = length-self.MAX_DATA_LEN
- self.senddataframe(seq,data[(seq-1)*self.MAX_DATA_LEN:])
- self.sendtailframe(seq+1)
-
-
- def download(self, filename1, filename2):
-
- f=open(filename1,"rb")
- data = f.read()
- f.close()
-
- print 'Sending', filename1, '...'
- self.senddata(data,self.bootheadaddress[self.chip])
- print 'Done\n'
-
- if filename2:
- f=open(filename2,"rb")
- data = f.read()
- f.close()
-
- print 'Sending', filename2, '...'
- self.senddata(data,self.bootdownloadaddress[self.chip])
- print 'Done\n'
-
-
-def burnboot(chiptype, serialport, filename1, filename2=''):
- downloader = bootdownload(chiptype, serialport)
- downloader.download(filename1, filename2)
-
-def startterm(serialport=0):
- try:
- miniterm = Miniterm(
- serialport,
- 115200,
- 'N',
- rtscts=False,
- xonxoff=False,
- echo=False,
- convert_outgoing=2,
- repr_mode=0,
- )
- except serial.SerialException, e:
- sys.stderr.write("could not open port %r: %s\n" % (port, e))
- sys.exit(1)
- miniterm.start()
- miniterm.join(True)
- miniterm.join()
-
-def main(argv):
- '''
- img2 = 'fastboot2.img'
- '''
- img1 = 'fastboot1.img'
- img2 = ''
- dev = '/dev/serial/by-id/usb-䕇䕎䥎_㄰㌲㔴㜶㤸-if00-port0'
- try:
- opts, args = getopt.getopt(argv,"hd:",["img1=","img2="])
- except getopt.GetoptError:
- print 'hisi-idt.py -d device --img1 <fastboot1> --img2 <fastboot2>'
- sys.exit(2)
- for opt, arg in opts:
- if opt == '-h':
- print 'hisi-idt.py -d device --img1 <fastboot1> --img2 <fastboot2>'
- sys.exit()
- elif opt in ("-d"):
- dev = arg
- elif opt in ("--img1"):
- img1 = arg
- elif opt in ("--img2"):
- img2 = arg
- print '+----------------------+'
- print ' Serial: ', dev
- print ' Image1: ', img1
- print ' Image2: ', img2
- print '+----------------------+\n'
-
- if not os.path.isfile(img1):
- print "Image don't exists:", img1
- sys.exit(1)
-
- if (img2):
- if not os.path.isfile(img2):
- print "Image don't exists:", img2
- sys.exit(1)
-
- burnboot('hi3716cv200', dev, img1, img2)
-
-if __name__ == "__main__":
- main(sys.argv[1:])
diff --git a/installer/hikey/l-loader.bin b/installer/hikey/l-loader.bin
deleted file mode 100644
index 3c271e3b..00000000
--- a/installer/hikey/l-loader.bin
+++ /dev/null
Binary files differ
diff --git a/installer/hikey/nvme.img b/installer/hikey/nvme.img
deleted file mode 100644
index e2c8fe92..00000000
--- a/installer/hikey/nvme.img
+++ /dev/null
Binary files differ
diff --git a/installer/hikey/ptable-aosp-4g.img b/installer/hikey/ptable-aosp-4g.img
deleted file mode 100644
index 43bf8a94..00000000
--- a/installer/hikey/ptable-aosp-4g.img
+++ /dev/null
Binary files differ
diff --git a/installer/hikey/ptable-aosp-8g.img b/installer/hikey/ptable-aosp-8g.img
deleted file mode 100644
index 631fd8a9..00000000
--- a/installer/hikey/ptable-aosp-8g.img
+++ /dev/null
Binary files differ
diff --git a/installer/hikey960/fip.bin b/installer/hikey960/fip.bin
deleted file mode 100644
index 53d49504..00000000
--- a/installer/hikey960/fip.bin
+++ /dev/null
Binary files differ
diff --git a/installer/hikey960/flash-all.sh b/installer/hikey960/flash-all.sh
index 2888020b..c894558c 100755
--- a/installer/hikey960/flash-all.sh
+++ b/installer/hikey960/flash-all.sh
@@ -1,30 +1,92 @@
#!/bin/bash
INSTALLER_DIR="`dirname ${0}`"
+ECHO_PREFIX="=== "
# for cases that don't run "lunch hikey960-userdebug"
if [ -z "${ANDROID_BUILD_TOP}" ]; then
- ANDROID_BUILD_TOP=${INSTALLER_DIR}/../../../../../
+ ANDROID_BUILD_TOP=$(cd ${INSTALLER_DIR}/../../../../../; pwd)
ANDROID_PRODUCT_OUT="${ANDROID_BUILD_TOP}/out/target/product/hikey960"
fi
if [ ! -d "${ANDROID_PRODUCT_OUT}" ]; then
- echo "error in locating out directory, check if it exist"
+ echo ${ECHO_PREFIX}"error in locating out directory, check if it exist"
exit
fi
-echo "android out dir:${ANDROID_PRODUCT_OUT}"
-
-fastboot flash xloader "${INSTALLER_DIR}"/hisi-sec_xloader.img
-fastboot flash ptable "${INSTALLER_DIR}"/hisi-ptable.img
-fastboot flash fastboot "${INSTALLER_DIR}"/hisi-fastboot.img
-fastboot reboot-bootloader
-fastboot flash nvme "${INSTALLER_DIR}"/hisi-nvme.img
-fastboot flash fw_lpm3 "${INSTALLER_DIR}"/hisi-lpm3.img
-fastboot flash trustfirmware "${INSTALLER_DIR}"/hisi-bl31.bin
-fastboot flash boot "${ANDROID_PRODUCT_OUT}"/boot.img
-fastboot flash dts "${ANDROID_PRODUCT_OUT}"/dt.img
-fastboot flash system "${ANDROID_PRODUCT_OUT}"/system.img
-fastboot flash vendor "${ANDROID_PRODUCT_OUT}"/vendor.img
-fastboot flash userdata "${ANDROID_PRODUCT_OUT}"/userdata.img
+echo ${ECHO_PREFIX}"android out dir:${ANDROID_PRODUCT_OUT}"
+
+. "${ANDROID_BUILD_TOP}/device/linaro/hikey/vendor-package-ver.sh"
+
+VENDOR_DIR=$ANDROID_BUILD_TOP/vendor/linaro/hikey960/${EXPECTED_LINARO_VENDOR_VERSION}/
+
+# TODO: Pull one-time recovery/qdl path out of standard install
+# Flash bootloader firmware files
+if [ ! -d "${VENDOR_DIR}/" ]; then
+ echo "FLASH-ALL-AOSP: Missing vendor firmware package?"
+ echo " Make sure the vendor binaries have been downloaded from"
+ echo " ${VND_PKG_URL}"
+ echo " and extracted to $ANDROID_BUILD_TOP."
+ exit
+fi
+
+pushd $VENDOR_DIR/bootloader/
+
+function check_partition_table_version () {
+ fastboot erase reserved
+ if [ $? -eq 0 ]
+ then
+ IS_PTABLE_1MB_ALIGNED=true
+ else
+ IS_PTABLE_1MB_ALIGNED=false
+ fi
+}
+
+function flashing_atf_uefi () {
+ fastboot flash ptable prm_ptable.img
+ fastboot flash xloader hisi-sec_xloader.img
+ fastboot reboot-bootloader
+
+ fastboot flash fastboot l-loader.bin
+ fastboot flash fip fip.bin
+ fastboot flash nvme hisi-nvme.img
+ fastboot flash fw_lpm3 hisi-lpm3.img
+ fastboot flash trustfirmware hisi-bl31.bin
+ fastboot reboot-bootloader
+
+ fastboot flash ptable prm_ptable.img
+ fastboot flash xloader hisi-sec_xloader.img
+ fastboot flash fastboot l-loader.bin
+ fastboot flash fip fip.bin
+
+ fastboot flash boot "${ANDROID_PRODUCT_OUT}"/boot.img
+ fastboot flash super "${ANDROID_PRODUCT_OUT}"/super.img
+ fastboot flash userdata "${ANDROID_PRODUCT_OUT}"/userdata.img
+ fastboot format cache
+}
+
+function upgrading_ptable_1mb_aligned () {
+ fastboot flash xloader hisi-sec_xloader.img
+ fastboot flash ptable hisi-ptable.img
+ fastboot flash fastboot hisi-fastboot.img
+ fastboot reboot-bootloader
+}
+
+echo ${ECHO_PREFIX}"Checking partition table version..."
+check_partition_table_version
+
+if [ "${IS_PTABLE_1MB_ALIGNED}" == "true" ]
+then
+ echo ${ECHO_PREFIX}"Partition table is 1MB aligned. Flashing ATF/UEFI..."
+ flashing_atf_uefi
+else
+ echo ${ECHO_PREFIX}"Partition table is 512KB aligned."
+ echo ${ECHO_PREFIX}"Upgrading to 1MB aligned version..."
+ upgrading_ptable_1mb_aligned
+ echo ${ECHO_PREFIX}"Flashing ATF/UEFI..."
+ flashing_atf_uefi
+ echo ${ECHO_PREFIX}"Done"
+fi
+
fastboot reboot
+popd
diff --git a/installer/hikey960/hisi-bl31.bin b/installer/hikey960/hisi-bl31.bin
deleted file mode 100644
index abebea6d..00000000
--- a/installer/hikey960/hisi-bl31.bin
+++ /dev/null
Binary files differ
diff --git a/installer/hikey960/hisi-fastboot.img b/installer/hikey960/hisi-fastboot.img
deleted file mode 100644
index 72cbf90f..00000000
--- a/installer/hikey960/hisi-fastboot.img
+++ /dev/null
Binary files differ
diff --git a/installer/hikey960/hisi-lpm3.img b/installer/hikey960/hisi-lpm3.img
deleted file mode 100644
index bd0243bf..00000000
--- a/installer/hikey960/hisi-lpm3.img
+++ /dev/null
Binary files differ
diff --git a/installer/hikey960/hisi-nvme.img b/installer/hikey960/hisi-nvme.img
deleted file mode 100644
index ca5bc7c1..00000000
--- a/installer/hikey960/hisi-nvme.img
+++ /dev/null
Binary files differ
diff --git a/installer/hikey960/hisi-ptable.img b/installer/hikey960/hisi-ptable.img
deleted file mode 100644
index 3a4fe68c..00000000
--- a/installer/hikey960/hisi-ptable.img
+++ /dev/null
Binary files differ
diff --git a/installer/hikey960/hisi-sec_xloader.img b/installer/hikey960/hisi-sec_xloader.img
deleted file mode 100644
index 47c353b8..00000000
--- a/installer/hikey960/hisi-sec_xloader.img
+++ /dev/null
Binary files differ
diff --git a/installer/hikey960/l-loader.bin b/installer/hikey960/l-loader.bin
deleted file mode 100644
index 2ad7a238..00000000
--- a/installer/hikey960/l-loader.bin
+++ /dev/null
Binary files differ
diff --git a/installer/hikey960/mkdtimg b/installer/hikey960/mkdtimg
deleted file mode 100755
index 65722043..00000000
--- a/installer/hikey960/mkdtimg
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2017, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-from __future__ import print_function
-try:
- from os import fstat, stat, remove
- from sys import exit
- from argparse import ArgumentParser, FileType
- from ctypes import sizeof, Structure, c_char, c_int
- from struct import pack, calcsize
- import zlib
-except Exception as e:
- print("some module is needed:" + str(e))
- exit(-1)
-
-dt_head_info_fmt = '4sII'
-dt_entry_fmt = 'Q4I2Q'
-dtimg_version = 1
-dtb_count = 1
-
-def write32(output, value):
- output.write(chr(value & 255)) ; value=value // 256
- output.write(chr(value & 255)) ; value=value // 256
- output.write(chr(value & 255)) ; value=value // 256
- output.write(chr(value & 255))
-
-def compress(filename, input, output):
- output.write('\037\213\010')
- output.write(chr(0))
-
- statval = stat(filename)
- write32(output, 0)
- output.write('\002')
- output.write('\003')
-
- crcval = zlib.crc32("")
- compobj = zlib.compressobj(9, zlib.DEFLATED, -zlib.MAX_WBITS,
- zlib.DEF_MEM_LEVEL, 0)
- while True:
- data = input.read(1024)
- if data == "":
- break
- crcval = zlib.crc32(data, crcval)
- output.write(compobj.compress(data))
- output.write(compobj.flush())
- write32(output, crcval)
- write32(output, statval.st_size)
-
-def dtb_compress(dtb_file):
- try:
- outputname = dtb_file + '.gz'
- input = open(dtb_file, 'rb')
- output = open(outputname, 'wb')
- compress(dtb_file, input, output)
- input.close()
- output.close()
- except Exception as e:
- print('dtb_compress error:' + str(e))
- exit(-1)
- return outputname
-
-class dt_head_info(Structure):
- _fields_ = [('magic', c_char * 4),
- ('version', c_int),
- ('dt_count', c_int)]
-
-class dt_entry_t(Structure):
- _fields_ = [('dtb_size', c_int),
- ('dtb_offset', c_int)]
-
-def align_page_size(offset, pagesize):
- return (pagesize - (offset % pagesize))
-
-def write_head_info(head_info, args):
- args.output.write(pack(dt_head_info_fmt,
- head_info.magic,
- head_info.version,
- head_info.dt_count))
-
-def write_dtb_entry_t(dt_entry, args):
- args.output.write(pack(dt_entry_fmt,
- 0, # reserved
- dt_entry.dtb_size,
- 0, # reserved
- dt_entry.dtb_offset,
- 0, # reserved
- 0, # reserved
- 0)) # reserved
-
-def write_padding(args, padding):
- for i in range(0, padding):
- args.output.write('\x00')
-
-def write_dtb(args):
- dtb_file = args.dtb
- out_dtb = dtb_file
- if args.compress == True:
- out_dtb = dtb_compress(dtb_file)
- try:
- dtb_offset = calcsize(dt_head_info_fmt) + \
- calcsize(dt_entry_fmt) + \
- 4
- padding = align_page_size(dtb_offset, args.pagesize)
- dtb_size = stat(out_dtb).st_size
- dtb_size_padding = align_page_size(dtb_size, args.pagesize)
- dt_entry = dt_entry_t(dtb_size + dtb_size_padding,
- dtb_offset + padding)
- write_dtb_entry_t(dt_entry, args)
- args.output.write(pack('I', 0)) # SUCCESS code number
- write_padding(args, padding)
- with open(out_dtb, 'rb') as dtb_fd:
- args.output.write(dtb_fd.read(dtb_size))
- write_padding(args, dtb_size_padding)
- except Exception as e:
- print('write dtb error:' + str(e))
- exit(-1)
-
-def clean_gz_file(args):
- try:
- if args.compress != True:
- return
- remove(args.dtb + '.gz')
- except Exception as e:
- print('clean gz file error:' + str(e))
- exit(-1)
-
-def parse_cmdline():
- parser = ArgumentParser()
- parser.add_argument('-c', '--compress', help='compress dtb or not',
- action='store_true')
- parser.add_argument('-d', '--dtb', help='path to the dtb', type=str,
- required=True)
- parser.add_argument('-s', '--pagesize', help='align page size',
- type=int, choices=[2**i for i in range(11,15)],
- default=2048)
- parser.add_argument('-o', '--output', help='output file name',
- type=FileType('wb'), required=True)
- return parser.parse_args()
-
-def main():
- args = parse_cmdline()
- dtimg_head_info = dt_head_info('HSDT', dtimg_version, dtb_count)
- write_head_info(dtimg_head_info, args)
- write_dtb(args)
- clean_gz_file(args)
-
-if __name__ == '__main__':
- main()
diff --git a/installer/hikey960/prm_ptable.img b/installer/hikey960/prm_ptable.img
deleted file mode 100644
index c81ffcfa..00000000
--- a/installer/hikey960/prm_ptable.img
+++ /dev/null
Binary files differ
diff --git a/installer/hikey960/uefi-flash-all.sh b/installer/hikey960/uefi-flash-all.sh
deleted file mode 100755
index fe42486c..00000000
--- a/installer/hikey960/uefi-flash-all.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-INSTALLER_DIR="`dirname ${0}`"
-ECHO_PREFIX="=== "
-
-# for cases that don't run "lunch hikey960-userdebug"
-if [ -z "${ANDROID_BUILD_TOP}" ]; then
- ANDROID_BUILD_TOP=${INSTALLER_DIR}/../../../../../
- ANDROID_PRODUCT_OUT="${ANDROID_BUILD_TOP}/out/target/product/hikey960"
-fi
-
-if [ ! -d "${ANDROID_PRODUCT_OUT}" ]; then
- echo ${ECHO_PREFIX}"error in locating out directory, check if it exist"
- exit
-fi
-
-echo ${ECHO_PREFIX}"android out dir:${ANDROID_PRODUCT_OUT}"
-
-function check_partition_table_version () {
- fastboot erase reserved
- if [ $? -eq 0 ]
- then
- IS_PTABLE_1MB_ALIGNED=true
- else
- IS_PTABLE_1MB_ALIGNED=false
- fi
-}
-
-function flashing_atf_uefi () {
- fastboot flash ptable "${INSTALLER_DIR}"/prm_ptable.img
- fastboot flash xloader "${INSTALLER_DIR}"/hisi-sec_xloader.img
- fastboot reboot-bootloader
-
- fastboot flash fastboot "${INSTALLER_DIR}"/l-loader.bin
- fastboot flash fip "${INSTALLER_DIR}"/fip.bin
- fastboot flash nvme "${INSTALLER_DIR}"/hisi-nvme.img
- fastboot flash fw_lpm3 "${INSTALLER_DIR}"/hisi-lpm3.img
- fastboot flash trustfirmware "${INSTALLER_DIR}"/hisi-bl31.bin
- fastboot reboot-bootloader
-
- fastboot flash ptable "${INSTALLER_DIR}"/prm_ptable.img
- fastboot flash xloader "${INSTALLER_DIR}"/hisi-sec_xloader.img
- fastboot flash fastboot "${INSTALLER_DIR}"/l-loader.bin
- fastboot flash fip "${INSTALLER_DIR}"/fip.bin
-
- fastboot flash boot "${ANDROID_PRODUCT_OUT}"/boot.img
- fastboot flash system "${ANDROID_PRODUCT_OUT}"/system.img
- fastboot flash vendor "${ANDROID_PRODUCT_OUT}"/vendor.img
- fastboot flash cache "${ANDROID_PRODUCT_OUT}"/cache.img
- fastboot flash userdata "${ANDROID_PRODUCT_OUT}"/userdata.img
-}
-
-function upgrading_ptable_1mb_aligned () {
- fastboot flash xloader "${INSTALLER_DIR}"/hisi-sec_xloader.img
- fastboot flash ptable "${INSTALLER_DIR}"/hisi-ptable.img
- fastboot flash fastboot "${INSTALLER_DIR}"/hisi-fastboot.img
- fastboot reboot-bootloader
-}
-
-echo ${ECHO_PREFIX}"Checking partition table version..."
-check_partition_table_version
-
-if [ "${IS_PTABLE_1MB_ALIGNED}" == "true" ]
-then
- echo ${ECHO_PREFIX}"Partition table is 1MB aligned. Flashing ATF/UEFI..."
- flashing_atf_uefi
-else
- echo ${ECHO_PREFIX}"Partition table is 512KB aligned."
- echo ${ECHO_PREFIX}"Upgrading to 1MB aligned version..."
- upgrading_ptable_1mb_aligned
- echo ${ECHO_PREFIX}"Flasing ATF/UEFI..."
- flashing_atf_uefi
- echo ${ECHO_PREFIX}"Done"
-fi
-
-fastboot reboot