From 24b97382622ce1f3b0d59849051960dc1030d25b Mon Sep 17 00:00:00 2001 From: Adam Pigg Date: Thu, 22 Oct 2020 12:12:30 +0100 Subject: [PATCH] Add pinetabdev device, which uses the normal pinetab rootfs, but different uboot script --- flash-it.sh | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/flash-it.sh b/flash-it.sh index 8e4c384..005b3c4 100755 --- a/flash-it.sh +++ b/flash-it.sh @@ -5,14 +5,24 @@ BRANCH=master CUSTOM="" UBOOT_JOB=u-boot UBOOT_DIR=u-boot-bootloader + ROOTFS_PINEPHONE_1_0_JOB=pinephone-1.0-rootfs ROOTFS_PINEPHONE_1_1_JOB=pinephone-1.1-rootfs ROOTFS_PINETAB_JOB=pinetab-rootfs +ROOTFS_PINETABDEV_JOB=pinetab-rootfs ROOTFS_DEVKIT_JOB=devkit-rootfs ROOTFS_PINEPHONE_1_0_DIR=pinephone-1.0 ROOTFS_PINEPHONE_1_1_DIR=pinephone-1.1 ROOTFS_PINETAB_DIR=pinetab +ROOTFS_PINETABDEV_DIR=pinetab ROOTFS_DEVKIT_DIR=devkit + +UBOOT_PINEPHONE_1_0_DIR=pinephone-1.0 +UBOOT_PINEPHONE_1_1_DIR=pinephone-1.1 +UBOOT_PINETAB_DIR=pinetab +UBOOT_PINETABDEV_DIR=pinetabdev +UBOOT_DEVKIT_DIR=devkit + MOUNT_DATA=./data MOUNT_BOOT=./boot @@ -138,12 +148,13 @@ echo "" # Image selection echo -e "\e[1mWhich image do you want to flash?\e[0m" -select OPTION in "PinePhone 1.0 (Development) device" "PinePhone 1.1 (Brave Heart) device" "PineTab device" "Dont Be Evil devkit"; do +select OPTION in "PinePhone 1.0 (Development) device" "PinePhone 1.1 (Brave Heart) device" "PineTab device" "PineTab Dev device" "Dont Be Evil devkit"; do case $OPTION in - "PinePhone 1.0 (Development) device" ) ROOTFS_JOB=$ROOTFS_PINEPHONE_1_0_JOB; ROOTFS_DIR=$ROOTFS_PINEPHONE_1_0_DIR; break;; - "PinePhone 1.1 (Brave Heart) device" ) ROOTFS_JOB=$ROOTFS_PINEPHONE_1_1_JOB; ROOTFS_DIR=$ROOTFS_PINEPHONE_1_1_DIR; break;; - "PineTab device" ) ROOTFS_JOB=$ROOTFS_PINETAB_JOB; ROOTFS_DIR=$ROOTFS_PINETAB_DIR; break;; - "Dont Be Evil devkit" ) ROOTFS_JOB=$ROOTFS_DEVKIT_JOB; ROOTFS_DIR=$ROOTFS_DEVKIT_DIR; break;; + "PinePhone 1.0 (Development) device" ) ROOTFS_JOB=$ROOTFS_PINEPHONE_1_0_JOB; ROOTFS_DIR=$ROOTFS_PINEPHONE_1_0_DIR; UBOOT_DEV_DIR=$UBOOT_PINEPHONE_1_0_DIR; break;; + "PinePhone 1.1 (Brave Heart) device" ) ROOTFS_JOB=$ROOTFS_PINEPHONE_1_1_JOB; ROOTFS_DIR=$ROOTFS_PINEPHONE_1_1_DIR; UBOOT_DEV_DIR=$UBOOT_PINEPHONE_1_1_DIR; break;; + "PineTab device" ) ROOTFS_JOB=$ROOTFS_PINETAB_JOB; ROOTFS_DIR=$ROOTFS_PINETAB_DIR; UBOOT_DEV_DIR=$UBOOT_PINETAB_DIR; break;; + "PineTab Dev device" ) ROOTFS_JOB=$ROOTFS_PINETABDEV_JOB; ROOTFS_DIR=$ROOTFS_PINETABDEV_DIR; UBOOT_DEV_DIR=$UBOOT_PINETABDEV_DIR; break;; + "Dont Be Evil devkit" ) ROOTFS_JOB=$ROOTFS_DEVKIT_JOB; ROOTFS_DIR=$ROOTFS_DEVKIT_DIR; UBOOT_DEV_DIR=$UBOOT_DEVKIT_DIR; break;; esac done @@ -244,7 +255,7 @@ echo `ls $MOUNT_BOOT` if [ "$CUSTOM" != "" ]; then sudo sh -c "cp '${CUSTOM}/boot.scr' '$MOUNT_BOOT/boot.scr'" else - sudo sh -c "cp './u-boot-bootloader/$ROOTFS_DIR/boot.scr' '$MOUNT_BOOT/boot.scr'" + sudo sh -c "cp './u-boot-bootloader/$UBOOT_DEV_DIR/boot.scr' '$MOUNT_BOOT/boot.scr'" fi sync