From 5dfa1275ab65beabba049c034dcf205a1a5b5316 Mon Sep 17 00:00:00 2001
From: Apaczer <94932128+Apaczer@users.noreply.github.com>
Date: Tue, 25 Jul 2023 21:32:42 +0200
Subject: [PATCH] [BOARD] use gmenu2x configs from package output

---
 board/miyoo/boot/configs/input_bittboy.conf | 17 -----------------
 board/miyoo/boot/configs/input_miyoo.conf   | 17 -----------------
 board/miyoo/boot/firstboot                  |  4 ++--
 board/miyoo/genimage-sdcard.cfg             |  6 ------
 4 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 board/miyoo/boot/configs/input_bittboy.conf
 delete mode 100644 board/miyoo/boot/configs/input_miyoo.conf

diff --git a/board/miyoo/boot/configs/input_bittboy.conf b/board/miyoo/boot/configs/input_bittboy.conf
deleted file mode 100644
index a5582524..00000000
--- a/board/miyoo/boot/configs/input_bittboy.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-up=keyboard,273
-down=keyboard,274
-left=keyboard,276
-right=keyboard,275
-modifier=keyboard,8
-confirm=keyboard,308
-cancel=keyboard,306
-manual=keyboard,9
-section_prev=keyboard,32
-section_next=keyboard,304
-pagedown=keyboard,32
-pageup=keyboard,304
-settings=keyboard,13
-menu=keyboard,27
-power=keyboard,305
-dec=keyboard,280
-inc=keyboard,281
\ No newline at end of file
diff --git a/board/miyoo/boot/configs/input_miyoo.conf b/board/miyoo/boot/configs/input_miyoo.conf
deleted file mode 100644
index 5c5e9e93..00000000
--- a/board/miyoo/boot/configs/input_miyoo.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-up=keyboard,273
-down=keyboard,274
-left=keyboard,276
-right=keyboard,275
-modifier=keyboard,304
-confirm=keyboard,308
-cancel=keyboard,306
-manual=keyboard,32
-section_prev=keyboard,9
-section_next=keyboard,8
-pagedown=keyboard,8
-pageup=keyboard,9
-settings=keyboard,13
-menu=keyboard,27
-power=keyboard,305
-dec=keyboard,280
-inc=keyboard,281
\ No newline at end of file
diff --git a/board/miyoo/boot/firstboot b/board/miyoo/boot/firstboot
index df8cd0aa..219bd266 100755
--- a/board/miyoo/boot/firstboot
+++ b/board/miyoo/boot/firstboot
@@ -501,9 +501,9 @@ fi
 # copy over the config files
 echo "Copying default configuration files into place..." | tee -a ${LOG}
 if $BITTBOY_CONFIG; then
-	cp "${MOUNTDIR}/configs/input_bittboy.conf" "${MOUNTDIR}/configs/input.conf"
+	cp "/mnt/gmenu2x/input_bittboy.conf" "${MOUNTDIR}/configs/input.conf"
 elif $MIYOO_CONFIG; then
-	cp "${MOUNTDIR}/configs/input_miyoo.conf" "${MOUNTDIR}/configs/input.conf"
+	cp "/mnt/gmenu2x/input_miyoo.conf" "${MOUNTDIR}/configs/input.conf"
 fi
 mount -o remount,ro "${MOUNTDIR}" | tee -a ${LOG}
 if test -r "${BASEDIR}/configs/manifest"; then
diff --git a/board/miyoo/genimage-sdcard.cfg b/board/miyoo/genimage-sdcard.cfg
index 59ed1205..c3e5512b 100644
--- a/board/miyoo/genimage-sdcard.cfg
+++ b/board/miyoo/genimage-sdcard.cfg
@@ -17,12 +17,6 @@ image bootfs.vfat {
 		file configs/manifest {
 			image = "boot/configs/manifest"
 		}
-		file configs/input_bittboy.conf {
-			image = "boot/configs/input_bittboy.conf"
-		}
-		file configs/input_miyoo.conf {
-			image = "boot/configs/input_miyoo.conf"
-		}
 		file configs/.volume.conf {
 			image = "boot/configs/.volume.conf"
 		}