From 70ce2f10531f890ea4a9de21d0223345697f42f9 Mon Sep 17 00:00:00 2001
From: imi415 <imi415.public@gmail.com>
Date: Mon, 21 Jun 2021 01:38:19 +0800
Subject: [PATCH] Add condition in post script, fixed FAT offset.

---
 .../board/iminc/raspberrypi-4b-system-agent/config.tmpl.txt | 2 ++
 .../genimage-raspberrypi-4b-system-agent.cfg                | 2 +-
 .../board/iminc/raspberrypi-4b-system-agent/post-image.sh   | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/external_tree/board/iminc/raspberrypi-4b-system-agent/config.tmpl.txt b/external_tree/board/iminc/raspberrypi-4b-system-agent/config.tmpl.txt
index 6d7ea9b..2be1f4c 100644
--- a/external_tree/board/iminc/raspberrypi-4b-system-agent/config.tmpl.txt
+++ b/external_tree/board/iminc/raspberrypi-4b-system-agent/config.tmpl.txt
@@ -1,3 +1,5 @@
+# CUSTOM_CONFIG DO NOT EDIT THIS LINE
+
 # Enable spidev node
 dtparam=spi=on
 
diff --git a/external_tree/board/iminc/raspberrypi-4b-system-agent/genimage-raspberrypi-4b-system-agent.cfg b/external_tree/board/iminc/raspberrypi-4b-system-agent/genimage-raspberrypi-4b-system-agent.cfg
index dca6708..8de3286 100644
--- a/external_tree/board/iminc/raspberrypi-4b-system-agent/genimage-raspberrypi-4b-system-agent.cfg
+++ b/external_tree/board/iminc/raspberrypi-4b-system-agent/genimage-raspberrypi-4b-system-agent.cfg
@@ -21,7 +21,7 @@ image sdcard.img {
     partition-type = 0xC
     bootable = "true"
     image = "boot.vfat"
-    offset = 4K
+    offset = 4M
   }
 
   partition rootfs {
diff --git a/external_tree/board/iminc/raspberrypi-4b-system-agent/post-image.sh b/external_tree/board/iminc/raspberrypi-4b-system-agent/post-image.sh
index dcf5404..40cf3fb 100755
--- a/external_tree/board/iminc/raspberrypi-4b-system-agent/post-image.sh
+++ b/external_tree/board/iminc/raspberrypi-4b-system-agent/post-image.sh
@@ -42,8 +42,10 @@ __EOF__
 done
 
 if [[ -f "${CONFIG_TEMPLATE}" ]]; then
-	echo "Config template file exists, append to config.txt"
-	cat "${CONFIG_TEMPLATE}" >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+	if ! grep -qE '^# CUSTOM_CONFIG' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
+		echo "Config template file exists, append to config.txt"
+		cat "${CONFIG_TEMPLATE}" >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+	fi
 fi
 
 # Pass an empty rootpath. genimage makes a full copy of the given rootpath to