Various updates

Removed fastboot arguments not present in the current version and set
the firmware update script to fetch files from the JF Possibilities CHIP
archive.
This commit is contained in:
Ryan Fox 2022-01-02 01:49:33 -08:00
parent 7ce8f2ba65
commit fec033bba0
Signed by: flewkey
GPG Key ID: 94F56ADFD848851E
4 changed files with 8 additions and 10 deletions

View File

@ -197,10 +197,10 @@ else
echo == waiting for fastboot ==
if wait_for_fastboot; then
fastboot -i 0x1f3a -u flash UBI ${SPARSE_UBI}
fastboot -u flash UBI ${SPARSE_UBI}
assert_error 134
fastboot -i 0x1f3a continue
fastboot continue
assert_error 135
else
rm -rf "${TMPDIR}"

View File

@ -266,10 +266,10 @@ else
log "== waiting for fastboot =="
if wait_for_fastboot ${FASTBOOT_PORT}; then
fastboot ${FASTBOOT_PORT} -i 0x1f3a -u flash UBI ${SPARSE_UBI} > /dev/null
fastboot ${FASTBOOT_PORT} flash UBI ${SPARSE_UBI} > /dev/null
assert_error 134
fastboot ${FASTBOOT_PORT} -i 0x1f3a continue > /dev/null
fastboot ${FASTBOOT_PORT} continue > /dev/null
assert_error 135
else
exit 1

View File

@ -6,7 +6,7 @@ source $SCRIPTDIR/common.sh
DL_DIR=".dl"
IMAGESDIR=".new/firmware/images"
DL_URL="http://opensource.nextthing.co/chip/images"
DL_URL="http://chip.jfpossibilities.com/chip/images"
WGET="wget"

View File

@ -15,7 +15,6 @@ nand_writesize=4000
nand_oobsize=680
if [[ -z ${CHECK_DEPS} ]]; then
for TOOL in ${TOOLS[@]}; do
if [[ -z $(which $TOOL) ]]; then
echo " Error: Unable to locate $TOOL utility."
@ -24,7 +23,6 @@ if [[ -z ${CHECK_DEPS} ]]; then
exit 1
fi
done
fi
#------------------------------------------------------------
@ -52,7 +50,7 @@ wait_for_fastboot() {
echo -n "waiting for fastboot...";
export FLASH_WAITING_FOR_DEVICE=1
for ((i=$TIMEOUT; i>0; i--)) {
if [[ ! -z "$(${FASTBOOT} -i 0x1f3a $@ devices)" ]]; then
if [[ ! -z "$(${FASTBOOT} $@ devices)" ]]; then
echo "OK";
unset FLASH_WAITING_FOR_DEVICE
return 0;
@ -227,8 +225,8 @@ flash_images() {
export FLASH_VID_PID=1f3a1010
if wait_for_fastboot; then
${FASTBOOT} -i 0x1f3a -u flash UBI $IMAGESDIR/chip-$nand_erasesize-$nand_writesize-$nand_oobsize.ubi.sparse || RC=1
${FASTBOOT} -i 0x1f3a continue > /dev/null
${FASTBOOT} flash UBI $IMAGESDIR/chip-$nand_erasesize-$nand_writesize-$nand_oobsize.ubi.sparse || RC=1
${FASTBOOT} continue > /dev/null
else
echo "failed to flash the UBI image"
RC=1