From f2eb77888b3465de3407868aa7ce358e4bceca8b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Thu, 10 Jan 2019 13:34:40 +0000
Subject: [PATCH] Tidying
---
src/freedombone-image-hardware-setup | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index 05adb8308..b0e13c1fd 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -41,8 +41,8 @@ enable_serial_console() {
arm_setup_boot() {
dtb="$1"
arm_root_device='mmcblk0p2'
- if [ "$2" ]; then
- arm_root_device="$2"
+ if [ "$EXTERNAL_DRIVE" ]; then
+ arm_root_device="$EXTERNAL_DRIVE"
fi
# Setup boot.cmd
@@ -210,53 +210,53 @@ setup_flash_kernel() {
case "$MACHINE" in
beagleboneblack)
- arm_setup_boot am335x-boneblack "$EXTERNAL_DRIVE"
+ arm_setup_boot am335x-boneblack
beaglebone_flash "TI AM335x BeagleBone Black"
beaglebone_repack_kernel am335x-boneblack
enable_serial_console ttyO0
;;
beaglebonegreen)
- arm_setup_boot am335x-bonegreen "$EXTERNAL_DRIVE"
+ arm_setup_boot am335x-bonegreen
beaglebone_flash "TI AM335x BeagleBone Green"
beaglebone_repack_kernel am335x-bonegreen
enable_serial_console ttyO0
;;
beaglex15)
- arm_setup_boot am57xx-beagle-x15 "$EXTERNAL_DRIVE"
+ arm_setup_boot am57xx-beagle-x15
beaglebone_flash "TI AM5728 BeagleBoard-X15"
beaglebone_repack_kernel am57xx-beagle-x15
enable_serial_console ttyO0
;;
cubietruck)
- arm_setup_boot sun7i-a20-cubietruck "$EXTERNAL_DRIVE"
+ arm_setup_boot sun7i-a20-cubietruck
enable_serial_console ttyS0
;;
a20-olinuxino-lime)
- arm_setup_boot sun7i-a20-olinuxino-lime "$EXTERNAL_DRIVE"
+ arm_setup_boot sun7i-a20-olinuxino-lime
enable_serial_console ttyS0
;;
a20-olinuxino-lime2)
- arm_setup_boot sun7i-a20-olinuxino-lime2 "$EXTERNAL_DRIVE"
+ arm_setup_boot sun7i-a20-olinuxino-lime2
enable_serial_console ttyS0
;;
a20-olinuxino-micro)
- arm_setup_boot sun7i-a20-olinuxino-micro "$EXTERNAL_DRIVE"
+ arm_setup_boot sun7i-a20-olinuxino-micro
enable_serial_console ttyS0
;;
banana-pro)
- arm_setup_boot sun7i-a20-bananapro "$EXTERNAL_DRIVE"
+ arm_setup_boot sun7i-a20-bananapro
enable_serial_console ttyS0
;;
cubieboard2)
- arm_setup_boot sun7i-a20-cubieboard2 "$EXTERNAL_DRIVE"
+ arm_setup_boot sun7i-a20-cubieboard2
enable_serial_console ttyS0
;;
pcduino3)
- arm_setup_boot sun7i-a20-pcduino3 "$EXTERNAL_DRIVE"
+ arm_setup_boot sun7i-a20-pcduino3
enable_serial_console ttyS0
;;
rock64)
- arm_setup_boot "rockchip/rk3328-rock64" "$EXTERNAL_DRIVE"
+ arm_setup_boot "rockchip/rk3328-rock64"
enable_serial_console ttyS0
;;
esac
--
GitLab