From 78ff22e6478e989bddcf9b298ae00271649ab7d9 Mon Sep 17 00:00:00 2001
From: Ognian <Ognian@users.noreply.github.com>
Date: Wed, 16 Nov 2022 12:23:56 +0100
Subject: [PATCH 1/2] add --efi-dir option to build-arm-iamge.sh

This option allows modification of raspberry pi boot options.
see https://www.raspberrypi.com/documentation/computers/config_txt.html#what-is-config-txt

Signed-off-by: Ognian <Ognian@users.noreply.github.com>
---
 tools-image/build-arm-image.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tools-image/build-arm-image.sh b/tools-image/build-arm-image.sh
index ad2721a..028e517 100755
--- a/tools-image/build-arm-image.sh
+++ b/tools-image/build-arm-image.sh
@@ -100,6 +100,7 @@ usage()
     echo " --local: (optional) Use local repository when building"
     echo " --directory: (optional) A directory which will be used for active/passive/recovery system"
     echo " --model: (optional) The board model"
+    echo " --efi-dir: (optional) A directory with files which will be added to the efi partition"
     exit 1
 }
 
@@ -174,6 +175,10 @@ while [ "$#" -gt 0 ]; do
             shift 1
             model=$1
             ;;
+        --efi-dir)
+            shift 1
+            efi_dir=$1
+            ;;
         --final-repo)
             shift 1
             final_repo=$1
@@ -313,6 +318,10 @@ if [ -z "$EFI" ]; then
 fi
 
 cp -rfv /arm/grub/efi/* $EFI
+if [ -n "$EFI" ] && [  -n "$efi_dir" ]; then
+  echo "Copy $efi_dir to EFI directory"
+  cp -rfv $efi_dir $EFI
+fi
 
 echo ">> Writing image and partition table"
 dd if=/dev/zero of="${output_image}" bs=1024000 count="${size}" || exit 1

From 8a9b3e9f71bec3d60dde33ee825b3b834d788b64 Mon Sep 17 00:00:00 2001
From: Ognian <Ognian@users.noreply.github.com>
Date: Wed, 16 Nov 2022 17:24:57 +0100
Subject: [PATCH 2/2] cp dir content not dir

Signed-off-by: Ognian <Ognian@users.noreply.github.com>
---
 tools-image/build-arm-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools-image/build-arm-image.sh b/tools-image/build-arm-image.sh
index 028e517..687e730 100755
--- a/tools-image/build-arm-image.sh
+++ b/tools-image/build-arm-image.sh
@@ -320,7 +320,7 @@ fi
 cp -rfv /arm/grub/efi/* $EFI
 if [ -n "$EFI" ] && [  -n "$efi_dir" ]; then
   echo "Copy $efi_dir to EFI directory"
-  cp -rfv $efi_dir $EFI
+  cp -rfv $efi_dir/* $EFI
 fi
 
 echo ">> Writing image and partition table"