diff --git a/projects/Rockchip/bootloader/canupdate.sh b/projects/Rockchip/bootloader/canupdate.sh
index 908179b820..879d392cf1 100644
--- a/projects/Rockchip/bootloader/canupdate.sh
+++ b/projects/Rockchip/bootloader/canupdate.sh
@@ -11,7 +11,7 @@ case $(uname -r) in
 esac
 
 # Allow upgrades between arm and aarch64
-if [ "$1" = "@PROJECT@.arm" -o "$1" = "@PROJECT@.aarch64" ]; then
+if [ "${1}" = "@PROJECT@.arm" -o "${1}" = "@PROJECT@.aarch64" ]; then
   exit 0
 else
   exit 1
diff --git a/projects/Rockchip/bootloader/install b/projects/Rockchip/bootloader/install
index aa50eaf105..e42d89f7e5 100644
--- a/projects/Rockchip/bootloader/install
+++ b/projects/Rockchip/bootloader/install
@@ -4,31 +4,31 @@
 PKG_RKBIN="$(get_build_dir rkbin)"
 PKG_SOC="${DEVICE/RK/rk}"
 
-case "$PKG_SOC" in
+case "${PKG_SOC}" in
   rk3036)
     PKG_DATAFILE="spl/u-boot-spl-nodtb.bin"
     PKG_LOADER="u-boot-dtb.bin"
     ;;
   rk3288)
-    PKG_DATAFILE="$PKG_RKBIN/rk32/rk3288_ddr_400MHz_v1.08.bin"
-    PKG_LOADER="$PKG_RKBIN/rk32/rk3288_miniloader_v2.58.bin"
+    PKG_DATAFILE="${PKG_RKBIN}/rk32/rk3288_ddr_400MHz_v1.08.bin"
+    PKG_LOADER="${PKG_RKBIN}/rk32/rk3288_miniloader_v2.58.bin"
     PKG_LOAD_ADDR="0x0"
     ;;
   rk3328)
-    if [ "$UBOOT_SYSTEM" = "roc-cc" -o "$UBOOT_SYSTEM" = "box-trn9" ]; then
-      PKG_DATAFILE="$PKG_RKBIN/rk33/rk3328_ddr_933MHz_v1.16.bin"
+    if [ "${UBOOT_SYSTEM}" = "roc-cc" -o "${UBOOT_SYSTEM}" = "box-trn9" ]; then
+      PKG_DATAFILE="${PKG_RKBIN}/rk33/rk3328_ddr_933MHz_v1.16.bin"
     else
-      PKG_DATAFILE="$PKG_RKBIN/rk33/rk3328_ddr_786MHz_v1.16.bin"
+      PKG_DATAFILE="${PKG_RKBIN}/rk33/rk3328_ddr_786MHz_v1.16.bin"
     fi
-    PKG_LOADER="$PKG_RKBIN/rk33/rk3328_miniloader_v2.50.bin"
-    PKG_BL31="$PKG_RKBIN/rk33/rk3328_bl31_v1.42.elf"
+    PKG_LOADER="${PKG_RKBIN}/rk33/rk3328_miniloader_v2.50.bin"
+    PKG_BL31="${PKG_RKBIN}/rk33/rk3328_bl31_v1.42.elf"
     PKG_BL31_ADDR="0x10000"
     PKG_LOAD_ADDR="0x200000"
     ;;
   rk3399)
-    PKG_DATAFILE="$PKG_RKBIN/rk33/rk3399_ddr_800MHz_v1.17.bin"
-    PKG_LOADER="$PKG_RKBIN/rk33/rk3399_miniloader_v1.24.bin"
-    PKG_BL31="$PKG_RKBIN/rk33/rk3399_bl31_v1.31.elf"
+    PKG_DATAFILE="${PKG_RKBIN}/rk33/rk3399_ddr_800MHz_v1.17.bin"
+    PKG_LOADER="${PKG_RKBIN}/rk33/rk3399_miniloader_v1.24.bin"
+    PKG_BL31="${PKG_RKBIN}/rk33/rk3399_bl31_v1.31.elf"
     PKG_BL31_ADDR="0x40000"
     PKG_LOAD_ADDR="0x200000"
     ;;
@@ -38,25 +38,25 @@ case "$PKG_SOC" in
     ;;
 esac
 
-if [ -n "$PKG_DATAFILE" -a -n "$PKG_LOADER" ]; then
-  tools/mkimage -n $PKG_SOC -T rksd -d "$PKG_DATAFILE" idbloader.img
-  cat "$PKG_LOADER" >> idbloader.img
-  cp -av idbloader.img $INSTALL/usr/share/bootloader
+if [ -n "${PKG_DATAFILE}" -a -n "${PKG_LOADER}" ]; then
+  tools/mkimage -n ${PKG_SOC} -T rksd -d "${PKG_DATAFILE}" idbloader.img
+  cat "${PKG_LOADER}" >> idbloader.img
+  cp -av idbloader.img ${INSTALL}/usr/share/bootloader
 fi
 
-if [ -n "$PKG_LOAD_ADDR" ]; then
-  $PKG_RKBIN/tools/loaderimage --pack --uboot u-boot-dtb.bin uboot.img $PKG_LOAD_ADDR
-  cp -av uboot.img $INSTALL/usr/share/bootloader
+if [ -n "${PKG_LOAD_ADDR}" ]; then
+  ${PKG_RKBIN}/tools/loaderimage --pack --uboot u-boot-dtb.bin uboot.img ${PKG_LOAD_ADDR}
+  cp -av uboot.img ${INSTALL}/usr/share/bootloader
 fi
 
-if [ -n "$PKG_BL31" ]; then
+if [ -n "${PKG_BL31}" ]; then
   cat >trust.ini <<EOF
 [BL30_OPTION]
 SEC=0
 [BL31_OPTION]
 SEC=1
-PATH=$PKG_BL31
-ADDR=$PKG_BL31_ADDR
+PATH=${PKG_BL31}
+ADDR=${PKG_BL31_ADDR}
 [BL32_OPTION]
 SEC=0
 [BL33_OPTION]
@@ -64,6 +64,6 @@ SEC=0
 [OUTPUT]
 PATH=trust.img
 EOF
-  $PKG_RKBIN/tools/trust_merger --verbose trust.ini
-  cp -av trust.img $INSTALL/usr/share/bootloader
+  ${PKG_RKBIN}/tools/trust_merger --verbose trust.ini
+  cp -av trust.img ${INSTALL}/usr/share/bootloader
 fi
diff --git a/projects/Rockchip/bootloader/mkimage b/projects/Rockchip/bootloader/mkimage
index b8dfdf3a60..ff39ec9195 100644
--- a/projects/Rockchip/bootloader/mkimage
+++ b/projects/Rockchip/bootloader/mkimage
@@ -1,15 +1,15 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
-if [ -f "$RELEASE_DIR/3rdparty/bootloader/idbloader.img" ]; then
+if [ -f "${RELEASE_DIR}/3rdparty/bootloader/idbloader.img" ]; then
   echo "image: burn idbloader.img to image..."
-  dd if="$RELEASE_DIR/3rdparty/bootloader/idbloader.img" of="$DISK" bs=32k seek=1 conv=fsync,notrunc >"$SAVE_ERROR" 2>&1 || show_error
+  dd if="${RELEASE_DIR}/3rdparty/bootloader/idbloader.img" of="${DISK}" bs=32k seek=1 conv=fsync,notrunc >"${SAVE_ERROR}" 2>&1 || show_error
 fi
-if [ -f "$RELEASE_DIR/3rdparty/bootloader/uboot.img" ]; then
+if [ -f "${RELEASE_DIR}/3rdparty/bootloader/uboot.img" ]; then
   echo "image: burn uboot.img to image..."
-  dd if="$RELEASE_DIR/3rdparty/bootloader/uboot.img" of="$DISK" bs=64k seek=128 conv=fsync,notrunc >"$SAVE_ERROR" 2>&1 || show_error
+  dd if="${RELEASE_DIR}/3rdparty/bootloader/uboot.img" of="${DISK}" bs=64k seek=128 conv=fsync,notrunc >"${SAVE_ERROR}" 2>&1 || show_error
 fi
-if [ -f "$RELEASE_DIR/3rdparty/bootloader/trust.img" ]; then
+if [ -f "${RELEASE_DIR}/3rdparty/bootloader/trust.img" ]; then
   echo "image: burn trust.img to image..."
-  dd if="$RELEASE_DIR/3rdparty/bootloader/trust.img" of="$DISK" bs=64k seek=192 conv=fsync,notrunc >"$SAVE_ERROR" 2>&1 || show_error
+  dd if="${RELEASE_DIR}/3rdparty/bootloader/trust.img" of="${DISK}" bs=64k seek=192 conv=fsync,notrunc >"${SAVE_ERROR}" 2>&1 || show_error
 fi
diff --git a/projects/Rockchip/bootloader/release b/projects/Rockchip/bootloader/release
index 25a3210c67..d9649bc88f 100644
--- a/projects/Rockchip/bootloader/release
+++ b/projects/Rockchip/bootloader/release
@@ -1,20 +1,20 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
-SRCDIR="$BUILD/image/system/usr/share/bootloader"
-DSTDIR="$RELEASE_DIR/3rdparty/bootloader"
+SRCDIR="${BUILD}/image/system/usr/share/bootloader"
+DSTDIR="${RELEASE_DIR}/3rdparty/bootloader"
 
-mkdir -p "$DSTDIR"
-  if [ -n "$UBOOT_SYSTEM" ]; then
-    if [ -f "$SRCDIR/idbloader.img" ]; then
-      cp -a "$SRCDIR/idbloader.img" "$DSTDIR"
+mkdir -p "${DSTDIR}"
+  if [ -n "${UBOOT_SYSTEM}" ]; then
+    if [ -f "${SRCDIR}/idbloader.img" ]; then
+      cp -a "${SRCDIR}/idbloader.img" "${DSTDIR}"
     fi
-    if [ -f "$SRCDIR/uboot.img" ]; then
-      cp -a "$SRCDIR/uboot.img" "$DSTDIR"
+    if [ -f "${SRCDIR}/uboot.img" ]; then
+      cp -a "${SRCDIR}/uboot.img" "${DSTDIR}"
     fi
-    if [ -f "$SRCDIR/trust.img" ]; then
-      cp -a "$SRCDIR/trust.img" "$DSTDIR"
+    if [ -f "${SRCDIR}/trust.img" ]; then
+      cp -a "${SRCDIR}/trust.img" "${DSTDIR}"
     fi
   fi
 
-  cp -a "$SRCDIR"/${DEVICE,,}-*.dtb "$DSTDIR"
+  cp -a "${SRCDIR}"/${DEVICE,,}-*.dtb "${DSTDIR}"
diff --git a/projects/Rockchip/bootloader/update.sh b/projects/Rockchip/bootloader/update.sh
index d2a6993dd2..fe5ade8562 100644
--- a/projects/Rockchip/bootloader/update.sh
+++ b/projects/Rockchip/bootloader/update.sh
@@ -1,50 +1,50 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
-[ -z "$SYSTEM_ROOT" ] && SYSTEM_ROOT=""
-[ -z "$BOOT_ROOT" ] && BOOT_ROOT="/flash"
-[ -z "$BOOT_PART" ] && BOOT_PART=$(df "$BOOT_ROOT" | tail -1 | awk {' print $1 '})
-if [ -z "$BOOT_DISK" ]; then
-  case $BOOT_PART in
+[ -z "${SYSTEM_ROOT}" ] && SYSTEM_ROOT=""
+[ -z "${BOOT_ROOT}" ] && BOOT_ROOT="/flash"
+[ -z "${BOOT_PART}" ] && BOOT_PART=$(df "${BOOT_ROOT}" | tail -1 | awk {' print $1 '})
+if [ -z "${BOOT_DISK}" ]; then
+  case ${BOOT_PART} in
     /dev/sd[a-z][0-9]*)
-      BOOT_DISK=$(echo $BOOT_PART | sed -e "s,[0-9]*,,g")
+      BOOT_DISK=$(echo ${BOOT_PART} | sed -e "s,[0-9]*,,g")
       ;;
     /dev/mmcblk*)
-      BOOT_DISK=$(echo $BOOT_PART | sed -e "s,p[0-9]*,,g")
+      BOOT_DISK=$(echo ${BOOT_PART} | sed -e "s,p[0-9]*,,g")
       ;;
   esac
 fi
 
-# mount $BOOT_ROOT r/w
-  mount -o remount,rw $BOOT_ROOT
+# mount ${BOOT_ROOT} r/w
+  mount -o remount,rw ${BOOT_ROOT}
 
 # update device tree
-  for all_dtb in $BOOT_ROOT/*.dtb; do
-    dtb=$(basename $all_dtb)
-    if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then
-      echo -n "Updating $dtb... "
-      cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT
+  for all_dtb in ${BOOT_ROOT}/*.dtb; do
+    dtb=$(basename ${all_dtb})
+    if [ -f ${SYSTEM_ROOT}/usr/share/bootloader/${dtb} ]; then
+      echo -n "Updating ${dtb}... "
+      cp -p ${SYSTEM_ROOT}/usr/share/bootloader/${dtb} ${BOOT_ROOT}
       echo "done"
     fi
   done
 
 # update bootloader
-  if [ -f $SYSTEM_ROOT/usr/share/bootloader/idbloader.img ]; then
+  if [ -f ${SYSTEM_ROOT}/usr/share/bootloader/idbloader.img ]; then
     echo -n "Updating idbloader.img... "
-    dd if=$SYSTEM_ROOT/usr/share/bootloader/idbloader.img of=$BOOT_DISK bs=32k seek=1 conv=fsync &>/dev/null
+    dd if=${SYSTEM_ROOT}/usr/share/bootloader/idbloader.img of=${BOOT_DISK} bs=32k seek=1 conv=fsync &>/dev/null
     echo "done"
   fi
-  if [ -f $SYSTEM_ROOT/usr/share/bootloader/uboot.img ]; then
+  if [ -f ${SYSTEM_ROOT}/usr/share/bootloader/uboot.img ]; then
     echo -n "Updating uboot.img... "
-    dd if=$SYSTEM_ROOT/usr/share/bootloader/uboot.img of=$BOOT_DISK bs=64k seek=128 conv=fsync &>/dev/null
+    dd if=${SYSTEM_ROOT}/usr/share/bootloader/uboot.img of=${BOOT_DISK} bs=64k seek=128 conv=fsync &>/dev/null
     echo "done"
   fi
-  if [ -f $SYSTEM_ROOT/usr/share/bootloader/trust.img ]; then
+  if [ -f ${SYSTEM_ROOT}/usr/share/bootloader/trust.img ]; then
     echo -n "Updating trust.img... "
-    dd if=$SYSTEM_ROOT/usr/share/bootloader/trust.img of=$BOOT_DISK bs=64k seek=192 conv=fsync &>/dev/null
+    dd if=${SYSTEM_ROOT}/usr/share/bootloader/trust.img of=${BOOT_DISK} bs=64k seek=192 conv=fsync &>/dev/null
     echo "done"
   fi
 
-# mount $BOOT_ROOT r/o
+# mount ${BOOT_ROOT} r/o
   sync
-  mount -o remount,ro $BOOT_ROOT
+  mount -o remount,ro ${BOOT_ROOT}