Detect package, not the board. Warn if using on wrong board.

Change-Id: I4b3f7dd2d5c5d04f4345086205fc54fc9e8c5e87

Author: ayufan

dev-ayufan/root/usr/local/sbin/rock64_upgrade_bootloader.sh

@@ -7,15 +7,14 @@ if [[ "$(id -u)" -ne "0" ]]; then
     exit 1
 fi
 
-BOARD=
-if grep -qi rockpro64 /proc/device-tree/compatible || grep -qi rockpro64 /etc/flash-kernel/machine; then
+if dpkg -s "u-boot-rockchip-rockpro64" &>/dev/null; then
     BOARD=rockpro64
     LOADER_NAME=rksd_loader
-elif grep -qi rock64 /proc/device-tree/compatible || grep -qi rock64 /etc/flash-kernel/machine; then
+elif dpkg -s "u-boot-rockchip-rock64" &>/dev/null; then
     BOARD=rock64
     LOADER_NAME=rksd_loader
 else
-    exit "Unknown board."
+    exit "Unknown package installed."
     exit 1
 fi
 
@@ -30,6 +29,13 @@ echo "If this happens you will have to manually fix that outside of your Rock64.
 echo "If you are booting from SPI. You have to use 'rock64_write_spi_flash.sh'."
 echo ""
 
+if ! ( grep -qi "$BOARD" /proc/device-tree/compatible || grep -qi "$BOARD" /etc/flash-kernel/machine ); then
+    echo "You are currently running on different board ($(cat /proc/device-tree/model))."
+    echo "It may brick your device or the system unless"
+    echo "you know what are you doing."
+    echo ""
+fi
+
 while true; do
     echo "Type YES to continue or Ctrl-C to abort."
     read CONFIRM

dev-ayufan/root/usr/local/sbin/rock64_write_spi_flash.sh

@@ -12,15 +12,14 @@ if ! which nandwrite &>/dev/null; then
     exit 1
 fi
 
-BOARD=
-if grep -qi rockpro64 /proc/device-tree/compatible || grep -qi rockpro64 /etc/flash-kernel/machine; then
+if dpkg -s "u-boot-rockchip-rockpro64" &>/dev/null; then
     BOARD=rockpro64
     LOADER_NAME=rkspi_loader
-elif grep -qi rock64 /proc/device-tree/compatible || grep -qi rock64 /etc/flash-kernel/machine; then
+elif dpkg -s "u-boot-rockchip-rock64" &>/dev/null; then
     BOARD=rock64
     LOADER_NAME=rksd_loader
 else
-    exit "Unknown board."
+    exit "Unknown package installed."
     exit 1
 fi
 
@@ -35,6 +34,13 @@ echo "  and it will require that you use eMMC or SD"
 echo "  as your boot device."
 echo ""
 
+if ! ( grep -qi "$BOARD" /proc/device-tree/compatible || grep -qi "$BOARD" /etc/flash-kernel/machine ); then
+    echo "You are currently running on different board ($(cat /proc/device-tree/model))."
+    echo "It may brick your device or the system unless"
+    echo "you know what are you doing."
+    echo ""
+fi
+
 while true; do
     echo "Type YES to continue or Ctrl-C to abort."
     read CONFIRM