From b65d52ae598e9b9139a902c05ae8b00dc2819c04 Mon Sep 17 00:00:00 2001
From: Apaczer <94932128+Apaczer@users.noreply.github.com>
Date: Fri, 26 May 2023 00:07:39 +0200
Subject: [PATCH] [BOARD] add modules.custom.sh in BOOT partition (#35)

* add modules.custom script

* refactor MODULES_CUSTOM scripting in main (disabled by default)
---
 board/miyoo/boot/modules.custom.sh | 9 +++++++++
 board/miyoo/genimage-sdcard.cfg    | 1 +
 board/miyoo/rootfs/etc/main        | 6 +++---
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 board/miyoo/boot/modules.custom.sh

diff --git a/board/miyoo/boot/modules.custom.sh b/board/miyoo/boot/modules.custom.sh
new file mode 100644
index 00000000..3c9ea6e4
--- /dev/null
+++ b/board/miyoo/boot/modules.custom.sh
@@ -0,0 +1,9 @@
+# Leave one line uncommented to load expected video driver
+#
+modprobe r61520fb flip=1
+#modprobe r61520fb debug=1
+#modprobe st7789sfb lowcurrent=1 tefix=0
+#modprobe st7789sTEfb
+#modprobe rm68090fb
+#modprobe gc9306fb
+#modprobe hx8347dfb
diff --git a/board/miyoo/genimage-sdcard.cfg b/board/miyoo/genimage-sdcard.cfg
index 3a72e3c6..63976ef1 100644
--- a/board/miyoo/genimage-sdcard.cfg
+++ b/board/miyoo/genimage-sdcard.cfg
@@ -10,6 +10,7 @@ image bootfs.vfat {
 			"boot/console.cfg",
 			"boot/firstboot",
 			"boot/firstboot.custom.sh-OFF",
+			"boot/modules.custom.sh",
 			"boot/normalboot.custom.sh"
 		}
 		file configs/manifest {
diff --git a/board/miyoo/rootfs/etc/main b/board/miyoo/rootfs/etc/main
index f0fdf148..43cde768 100755
--- a/board/miyoo/rootfs/etc/main
+++ b/board/miyoo/rootfs/etc/main
@@ -70,9 +70,7 @@ gadget-ms /dev/mmcblk0p1 /dev/mmcblk0p4 >> "${LOGS}" 2>&1
 	  mv ${HOME}/.backlight.bak ${HOME}/.backlight.conf
 	  fi 
 	  # MODULES_CUSTOM scripting
-      if ((test -r "${BOOTDIR}/modules.custom.sh") && !(grep -q MODULES_CUSTOM\=\0 "${HOME}/options.cfg")); then
-          (cd "${BOOTDIR}" && sh modules.custom.sh ) >> "${LOGS}" 2>&1
-      else
+      if (!(test -r "${BOOTDIR}/modules.custom.sh") || !(grep -q MODULES_CUSTOM\=\1 "${HOME}/options.cfg")); then
 		# Load video module read from uEnv.txt & defined by variant in console.cfg
 		if (grep -q FLIP\=\1 "${HOME}/options.cfg"); then
 		modprobe $video $params flip=1
@@ -81,6 +79,8 @@ gadget-ms /dev/mmcblk0p1 /dev/mmcblk0p4 >> "${LOGS}" 2>&1
 		else
 		modprobe $video $params
 		fi
+      else
+        (cd "${BOOTDIR}" && sh modules.custom.sh ) >> "${LOGS}" 2>&1
       fi
     fi