From a1f8e0b9ca91ae2d9e8df15907c18e1eba2809d3 Mon Sep 17 00:00:00 2001
From: kszaq <737984+kszaq@users.noreply.github.com>
Date: Sun, 3 Nov 2024 10:38:47 +0100
Subject: [PATCH 1/2] Amlogic: update bootloader files only if they exist

This prevents copying all dtbs to /flash if there is
none present before the update.
---
 projects/Amlogic/bootloader/update.sh | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/projects/Amlogic/bootloader/update.sh b/projects/Amlogic/bootloader/update.sh
index d692ddd3e3..a46b5af6ec 100644
--- a/projects/Amlogic/bootloader/update.sh
+++ b/projects/Amlogic/bootloader/update.sh
@@ -26,8 +26,10 @@ mount -o remount,rw $BOOT_ROOT
 if [ -d $BOOT_ROOT/amlogic ]; then
   for dtbfile in $BOOT_ROOT/amlogic/*.dtb; do
     dtb=$(basename $dtbfile)
-    echo "Updating $dtb"
-    cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/amlogic/ 2>/dev/null || true
+    if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then
+      echo "Updating $dtb"
+      cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/amlogic/ 2>/dev/null || true
+    fi
   done
 fi
 
@@ -35,8 +37,10 @@ fi
 if [ -f $BOOT_ROOT/extlinux/extlinux.conf ]; then
   for dtbfile in $BOOT_ROOT/*.dtb; do
     dtb=$(basename $dtbfile)
-    echo "Updating $dtb"
-    cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/ 2>/dev/null || true
+    if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then
+      echo "Updating $dtb"
+      cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/ 2>/dev/null || true
+    fi
   done
 fi
 
@@ -44,8 +48,10 @@ fi
 if [ -d $BOOT_ROOT/dtb ]; then
   for dtbfile in $BOOT_ROOT/dtb/*.dtb; do
     dtb=$(basename $dtbfile)
-    echo "Updating $dtb"
-    cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/dtb/ 2>/dev/null || true
+    if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then
+      echo "Updating $dtb"
+      cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/dtb/ 2>/dev/null || true
+    fi
   done
 fi
 
@@ -53,8 +59,10 @@ fi
 if [ -f $BOOT_ROOT/uEnv.ini ]; then
   for scriptfile in $SYSTEM_ROOT/usr/share/bootloader/*_autoscript* $SYSTEM_ROOT/usr/share/bootloader/*.scr; do
     script=$(basename $scriptfile)
-    echo "Updating $script"
-    cp -p $SYSTEM_ROOT/usr/share/bootloader/$script $BOOT_ROOT/ 2>/dev/null || true
+    if [ -f $SYSTEM_ROOT/usr/share/bootloader/$script ]; then
+      echo "Updating $script"
+      cp -p $SYSTEM_ROOT/usr/share/bootloader/$script $BOOT_ROOT/ 2>/dev/null || true
+    fi
   done
 fi
 

From 53392f9252b72391fc21f1f76bf109102c6e2584 Mon Sep 17 00:00:00 2001
From: kszaq <737984+kszaq@users.noreply.github.com>
Date: Sun, 3 Nov 2024 10:42:27 +0100
Subject: [PATCH 2/2] Amlogic: do not silence errors on bootloader update

We are now checking if source file exists, any errors
should be displayed on the screen.
---
 projects/Amlogic/bootloader/update.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/Amlogic/bootloader/update.sh b/projects/Amlogic/bootloader/update.sh
index a46b5af6ec..5e6f073280 100644
--- a/projects/Amlogic/bootloader/update.sh
+++ b/projects/Amlogic/bootloader/update.sh
@@ -28,7 +28,7 @@ if [ -d $BOOT_ROOT/amlogic ]; then
     dtb=$(basename $dtbfile)
     if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then
       echo "Updating $dtb"
-      cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/amlogic/ 2>/dev/null || true
+      cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/amlogic/
     fi
   done
 fi
@@ -39,7 +39,7 @@ if [ -f $BOOT_ROOT/extlinux/extlinux.conf ]; then
     dtb=$(basename $dtbfile)
     if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then
       echo "Updating $dtb"
-      cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/ 2>/dev/null || true
+      cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/
     fi
   done
 fi
@@ -50,7 +50,7 @@ if [ -d $BOOT_ROOT/dtb ]; then
     dtb=$(basename $dtbfile)
     if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then
       echo "Updating $dtb"
-      cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/dtb/ 2>/dev/null || true
+      cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/dtb/
     fi
   done
 fi
@@ -61,7 +61,7 @@ if [ -f $BOOT_ROOT/uEnv.ini ]; then
     script=$(basename $scriptfile)
     if [ -f $SYSTEM_ROOT/usr/share/bootloader/$script ]; then
       echo "Updating $script"
-      cp -p $SYSTEM_ROOT/usr/share/bootloader/$script $BOOT_ROOT/ 2>/dev/null || true
+      cp -p $SYSTEM_ROOT/usr/share/bootloader/$script $BOOT_ROOT/
     fi
   done
 fi