diff --git a/reform2-imx8mq/mkreform-tools.sh b/reform2-imx8mq/mkreform-tools.sh
new file mode 100755
index 0000000000000000000000000000000000000000..a4500b16af2feb7bc4c50dbac8bb88b955af2cdf
--- /dev/null
+++ b/reform2-imx8mq/mkreform-tools.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+dpkg-deb --build reform-tools_*
+
diff --git a/reform2-imx8mq/reform-tools_1.0-3/DEBIAN/control b/reform2-imx8mq/reform-tools_1.0-3/DEBIAN/control
new file mode 100644
index 0000000000000000000000000000000000000000..532aebe61302ebbfd85a749898816cf8dcea5ef2
--- /dev/null
+++ b/reform2-imx8mq/reform-tools_1.0-3/DEBIAN/control
@@ -0,0 +1,9 @@
+Package: reform-tools
+Version: 1.0-3
+Section: base
+Priority: optional
+Architecture: arm64
+Depends: bash
+Maintainer: Lukas F. Hartmann <lukas@mntre.com>
+Description: MNT Reform System Tools
+ A number of scripts for managing boot media, displays, standby, plus a few help texts and gadgets for the customized sway desktop. Also contains /sbin/reform-init, a boot manager script that gets loaded by u-boot and which in turn launches the real /sbin/init after mounting an (encrypted) boot medium.
diff --git a/reform2-imx8mq/template-etc/reform-desktop-help b/reform2-imx8mq/reform-tools_1.0-3/etc/reform-desktop-help
similarity index 100%
rename from reform2-imx8mq/template-etc/reform-desktop-help
rename to reform2-imx8mq/reform-tools_1.0-3/etc/reform-desktop-help
diff --git a/reform2-imx8mq/template-etc/reform-help b/reform2-imx8mq/reform-tools_1.0-3/etc/reform-help
similarity index 100%
rename from reform2-imx8mq/template-etc/reform-help
rename to reform2-imx8mq/reform-tools_1.0-3/etc/reform-help
diff --git a/reform2-imx8mq/template-etc/reform-root-help b/reform2-imx8mq/reform-tools_1.0-3/etc/reform-root-help
similarity index 100%
rename from reform2-imx8mq/template-etc/reform-root-help
rename to reform2-imx8mq/reform-tools_1.0-3/etc/reform-root-help
diff --git a/reform2-imx8mq/template-etc/reform-init b/reform2-imx8mq/reform-tools_1.0-3/sbin/reform-init
similarity index 100%
rename from reform2-imx8mq/template-etc/reform-init
rename to reform2-imx8mq/reform-tools_1.0-3/sbin/reform-init
diff --git a/reform2-imx8mq/template-skel/bin/reform-chat b/reform2-imx8mq/reform-tools_1.0-3/usr/bin/reform-chat
similarity index 100%
rename from reform2-imx8mq/template-skel/bin/reform-chat
rename to reform2-imx8mq/reform-tools_1.0-3/usr/bin/reform-chat
diff --git a/reform2-imx8mq/template-skel/bin/compstat b/reform2-imx8mq/reform-tools_1.0-3/usr/bin/reform-compstat.py
similarity index 100%
rename from reform2-imx8mq/template-skel/bin/compstat
rename to reform2-imx8mq/reform-tools_1.0-3/usr/bin/reform-compstat.py
diff --git a/reform2-imx8mq/template-skel/bin/compstat.sh b/reform2-imx8mq/reform-tools_1.0-3/usr/bin/reform-compstat.sh
similarity index 57%
rename from reform2-imx8mq/template-skel/bin/compstat.sh
rename to reform2-imx8mq/reform-tools_1.0-3/usr/bin/reform-compstat.sh
index 79e47cc944984067701d69abb54bfff2312f3f49..eafcc734bf8c7632bb53c758a31650a4dbc9d13d 100755
--- a/reform2-imx8mq/template-skel/bin/compstat.sh
+++ b/reform2-imx8mq/reform-tools_1.0-3/usr/bin/reform-compstat.sh
@@ -3,5 +3,5 @@
# clean up any existing processes
pkill -f 'python3.*compstat'
-/usr/bin/python3 ~/bin/compstat -d 1 -i 0.3
+/usr/bin/python3 /usr/bin/reform-compstat.py -d 1 -i 0.3
diff --git a/reform2-imx8mq/template-skel/bin/connman-gtk.sh b/reform2-imx8mq/reform-tools_1.0-3/usr/bin/reform-connman-gtk.sh
similarity index 100%
rename from reform2-imx8mq/template-skel/bin/connman-gtk.sh
rename to reform2-imx8mq/reform-tools_1.0-3/usr/bin/reform-connman-gtk.sh
diff --git a/reform2-imx8mq/template-skel/bin/reform-desktop-help b/reform2-imx8mq/reform-tools_1.0-3/usr/bin/reform-desktop-help
similarity index 100%
rename from reform2-imx8mq/template-skel/bin/reform-desktop-help
rename to reform2-imx8mq/reform-tools_1.0-3/usr/bin/reform-desktop-help
diff --git a/reform2-imx8mq/template-skel/bin/reform-help b/reform2-imx8mq/reform-tools_1.0-3/usr/bin/reform-help
similarity index 100%
rename from reform2-imx8mq/template-skel/bin/reform-help
rename to reform2-imx8mq/reform-tools_1.0-3/usr/bin/reform-help
diff --git a/reform2-imx8mq/template-skel/bin/pavucontrol.sh b/reform2-imx8mq/reform-tools_1.0-3/usr/bin/reform-pavucontrol.sh
similarity index 100%
rename from reform2-imx8mq/template-skel/bin/pavucontrol.sh
rename to reform2-imx8mq/reform-tools_1.0-3/usr/bin/reform-pavucontrol.sh
diff --git a/reform2-imx8mq/template-skel/bin/reform-boot-config b/reform2-imx8mq/reform-tools_1.0-3/usr/sbin/reform-boot-config
similarity index 100%
rename from reform2-imx8mq/template-skel/bin/reform-boot-config
rename to reform2-imx8mq/reform-tools_1.0-3/usr/sbin/reform-boot-config
diff --git a/reform2-imx8mq/template-skel/bin/reform-config b/reform2-imx8mq/reform-tools_1.0-3/usr/sbin/reform-config
similarity index 100%
rename from reform2-imx8mq/template-skel/bin/reform-config
rename to reform2-imx8mq/reform-tools_1.0-3/usr/sbin/reform-config
diff --git a/reform2-imx8mq/template-skel/bin/reform-display-config b/reform2-imx8mq/reform-tools_1.0-3/usr/sbin/reform-display-config
similarity index 100%
rename from reform2-imx8mq/template-skel/bin/reform-display-config
rename to reform2-imx8mq/reform-tools_1.0-3/usr/sbin/reform-display-config
diff --git a/reform2-imx8mq/reform-tools_1.0-3/usr/sbin/reform-hw-setup.sh b/reform2-imx8mq/reform-tools_1.0-3/usr/sbin/reform-hw-setup.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b2dbc294010c269ac2da697574e60c2a8298febc
--- /dev/null
+++ b/reform2-imx8mq/reform-tools_1.0-3/usr/sbin/reform-hw-setup.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# This switch in WM8960 needs to be on for the headset mic input to work
+amixer -c 0 sset 'Left Input Mixer Boost' on
+
+# Enable wakeup from suspend on all UARTS
+echo enabled > /sys/devices/platform/soc@0/30800000.bus/30860000.serial/tty/ttymxc0/power/wakeup
+echo enabled > /sys/devices/platform/soc@0/30800000.bus/30890000.serial/tty/ttymxc1/power/wakeup
+echo enabled > /sys/devices/platform/soc@0/30800000.bus/30880000.serial/tty/ttymxc2/power/wakeup
+
diff --git a/reform2-imx8mq/template-skel/bin/reform-migrate b/reform2-imx8mq/reform-tools_1.0-3/usr/sbin/reform-migrate
similarity index 100%
rename from reform2-imx8mq/template-skel/bin/reform-migrate
rename to reform2-imx8mq/reform-tools_1.0-3/usr/sbin/reform-migrate
diff --git a/reform2-imx8mq/template-skel/bin/reform-standby b/reform2-imx8mq/reform-tools_1.0-3/usr/sbin/reform-standby
similarity index 100%
rename from reform2-imx8mq/template-skel/bin/reform-standby
rename to reform2-imx8mq/reform-tools_1.0-3/usr/sbin/reform-standby
diff --git a/reform2-imx8mq/template-etc/motd b/reform2-imx8mq/template-etc/motd
index 6aa8d30a4992ad44f8486b160f4817aaa4aa5be2..329c80734ecca54b159f8b1b0c870e65b81ecd7c 100644
--- a/reform2-imx8mq/template-etc/motd
+++ b/reform2-imx8mq/template-etc/motd
@@ -1,7 +1,7 @@
[48;2;94;250;38m [49m[48;2;119;241;22m [49m[48;2;145;228;10m [49m[48;2;169;210;3m [49m[48;2;192;190;1m [49m[48;2;213;166;3m [49m[48;2;230;141;11m [49m[48;2;243;116;24m [49m[48;2;251;91;40m [49m[48;2;254;68;60m [49m[48;2;253;47;83m [49m[48;2;246;29;108m [49m[48;2;235;15;133m [49m[48;2;219;5;158m [49m[48;2;200;1;182m [49m[48;2;178;1;204m [49m[48;2;153;7;222m [49m[48;2;128;17;237m [49m[48;2;103;32;248m [49m[48;2;79;50;253m [49m[48;2;56;72;254m[49m [m[?25h[?1;5;2004lWelcome to Debian GNU/Linux
on MNT Reform
+ System Image: 2021-03-02
https://mntre.com/reform
https://www.debian.org
-
diff --git a/reform2-imx8mq/template-etc/motd-reform b/reform2-imx8mq/template-etc/motd-reform
index d59997d98a396a753c0b1305b8ef726877f07932..329c80734ecca54b159f8b1b0c870e65b81ecd7c 100644
--- a/reform2-imx8mq/template-etc/motd-reform
+++ b/reform2-imx8mq/template-etc/motd-reform
@@ -1,7 +1,7 @@
[48;2;94;250;38m [49m[48;2;119;241;22m [49m[48;2;145;228;10m [49m[48;2;169;210;3m [49m[48;2;192;190;1m [49m[48;2;213;166;3m [49m[48;2;230;141;11m [49m[48;2;243;116;24m [49m[48;2;251;91;40m [49m[48;2;254;68;60m [49m[48;2;253;47;83m [49m[48;2;246;29;108m [49m[48;2;235;15;133m [49m[48;2;219;5;158m [49m[48;2;200;1;182m [49m[48;2;178;1;204m [49m[48;2;153;7;222m [49m[48;2;128;17;237m [49m[48;2;103;32;248m [49m[48;2;79;50;253m [49m[48;2;56;72;254m[49m [m[?25h[?1;5;2004lWelcome to Debian GNU/Linux
- on the MNT Reform 2.0
- System Build: 2020-06-05
+ on MNT Reform
+ System Image: 2021-03-02
- https://mntmn.com/reform
+ https://mntre.com/reform
https://www.debian.org
diff --git a/reform2-imx8mq/template-etc/reform-display.service b/reform2-imx8mq/template-etc/reform-hw-setup.service
similarity index 51%
rename from reform2-imx8mq/template-etc/reform-display.service
rename to reform2-imx8mq/template-etc/reform-hw-setup.service
index 2824a939974d4cd491fa92511b4f82e14b75784a..e355c4f81ff2468122b2183c0cacfae9ef508259 100644
--- a/reform2-imx8mq/template-etc/reform-display.service
+++ b/reform2-imx8mq/template-etc/reform-hw-setup.service
@@ -1,9 +1,9 @@
[Unit]
-Description=Reform2 internal display
+Description=MNT Reform Hardware Defaults Setup
[Service]
Type=oneshot
-ExecStart=/etc/reform-toggle-display.sh edp
+ExecStart=/usr/sbin/reform-hw-setup.sh
StandardOutput=journal
[Install]
diff --git a/reform2-imx8mq/template-etc/reform-toggle-display.sh b/reform2-imx8mq/template-etc/reform-toggle-display.sh
deleted file mode 100755
index 21f864b1978150e9758b10e9aa20d2c404a0a9fb..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/reform-toggle-display.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-cd /lib/modules/
-
-rmmod imx_dcss
-rmmod cdns_mhdp_imx
-rmmod nwl_dsi
-
-if [ $1 == "hdmi" ]
-then
- insmod cdns_mhdp_imx.ko
- insmod imx-dcss.ko dcss_use_hdmi=1
-fi
-
-if [ $1 == "edp" ]
-then
- insmod nwl-dsi.ko
- insmod imx-dcss.ko dcss_use_hdmi=0
-fi
-
diff --git a/reform2-imx8mq/template-skel/.config/waybar/config b/reform2-imx8mq/template-skel/.config/waybar/config
index c7a88c9683cf458f63d192faf70a7d3448a5aecd..67f097f36fdf7db51e203d7e451869011593a613 100644
--- a/reform2-imx8mq/template-skel/.config/waybar/config
+++ b/reform2-imx8mq/template-skel/.config/waybar/config
@@ -44,7 +44,7 @@
"format-linked": "NET {ifname} NO IP",
"format-disconnected": "OFFLINE",
//"format-alt": "NET {ifname}: {ipaddr}/{cidr}"
- "on-click": "~/bin/connman-gtk.sh"
+ "on-click": "reform-connman-gtk.sh"
},
"pulseaudio": {
// "scroll-step": 1,
@@ -54,13 +54,13 @@
"format-muted": "MUTED {format_source}",
"format-source": "{volume}%",
"format-source-muted": "MUTE",
- "on-click": "pavucontrol"
+ "on-click": "reform-pavucontrol.sh"
},
"custom/stat": {
"format": "{}",
"max-length": 20,
"interval": 0,
- "exec": "~/bin/compstat.sh",
+ "exec": "reform-compstat.sh",
"on-click": "gnome-system-monitor"
}
}