2 files changed, 7 insertions, 1 deletions

diff --git a/firmware/export/system.h b/firmware/export/system.h
index def3122205..172fe05b6e 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -31,7 +31,13 @@ extern void system_reboot (void);
 /* Called from any UIE handler and panicf - wait for a key and return
  * to reboot system. */
 extern void system_exception_wait(void);
+
+#if NUM_CORES == 1
+extern void system_init(void) INIT_ATTR;
+#else
+/* TODO: probably safe to use INIT_ATTR on multicore but this needs checking */
 extern void system_init(void);
+#endif
 
 extern long cpu_frequency;
 
diff --git a/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c
index d7ebeea024..22873bfef0 100644
--- a/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c
@@ -199,7 +199,7 @@ void system_exception_wait(void)
     system_halt();
 }
 
-void INIT_ATTR system_init(void)
+void system_init(void)
 {
     static const enum IMX31_CG_LIST disable_clocks[] INITDATA_ATTR =
     {