1 files changed, 10 insertions, 0 deletions

diff --git a/firmware/target/arm/imx31/gigabeat-s/system-imx31.c b/firmware/target/arm/imx31/gigabeat-s/system-imx31.c
index 1e084485ac..c339f4fe7c 100644
--- a/firmware/target/arm/imx31/gigabeat-s/system-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/system-imx31.c
@@ -65,6 +65,16 @@ int system_memory_guard(int newmode)
 
 void system_reboot(void)
 {
+    /* Multi-context so no SPI available (WDT?)  */
+    while (1);
+}
+
+void system_exception_wait(void)
+{
+    /* Called in many contexts so button reading may be a chore */
+    avic_disable_int(ALL);
+    core_idle();
+    while (1);
 }
 
 void system_init(void)