5 files changed, 41 insertions, 8 deletions

diff --git a/firmware/export/config.h b/firmware/export/config.h
index d2ebbbf071..8726a8d6f4 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -1070,7 +1070,7 @@ Lyre prototype 1 */
 
 #if (defined(CPU_PP) || (CONFIG_CPU == AS3525) || (CONFIG_CPU == AS3525v2) || \
     (CONFIG_CPU == IMX31L) || (CONFIG_CPU == IMX233) || \
-     (CONFIG_CPU == RK27XX) || (CONFIG_CPU == X1000) || defined(CPU_COLDFIRE)) \
+     (CONFIG_CPU == RK27XX) || defined(CPU_MIPS) || defined(CPU_COLDFIRE)) \
     && (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(BOOTLOADER)
 /* Functions that have INIT_ATTR attached are NOT guaranteed to survive after
  * root_menu() has been called. Their code may be overwritten by other data or
diff --git a/firmware/target/mips/ingenic_jz47xx/app.lds b/firmware/target/mips/ingenic_jz47xx/app.lds
index cbeb7c1aaf..1d300fed82 100644
--- a/firmware/target/mips/ingenic_jz47xx/app.lds
+++ b/firmware/target/mips/ingenic_jz47xx/app.lds
@@ -1,4 +1,6 @@
 #include "config.h"
+#define __ASSEMBLY__
+#include "cpu.h"
 
 OUTPUT_FORMAT("elf32-littlemips")
 OUTPUT_ARCH(MIPS)
@@ -20,10 +22,15 @@ INPUT(target/mips/system-mips.o)
 /* Where the codec buffer ends, and the plugin buffer starts */
 #define ENDCODECADDR  (ENDAUDIOADDR + CODEC_SIZE)
 
+/* Place init code in the codec buffer */
+#define INITBASE   ENDAUDIOADDR
+#define INITSIZE   CODEC_SIZE
+
 MEMORY
 {
    DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE
    IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE
+   INIT : ORIGIN = INITBASE, LENGTH = INITSIZE
 }
 
 SECTIONS
@@ -40,6 +47,9 @@ SECTIONS
     .text :
     {
         *(.text*);
+#ifndef HAVE_INIT_ATTR
+        *(.init*);
+#endif
     } > DRAM
 
     . = ALIGN(4);
@@ -81,6 +91,16 @@ SECTIONS
     } > IRAM
     _iramcopy = LOADADDR(.iram);
 
+#ifdef HAVE_INIT_ATTR
+    .init :
+    {
+        _initstart = .;
+        *(.init*);
+        _initend = .;
+    } > INIT AT> DRAM
+    _initcopy = LOADADDR(.init);
+#endif
+
     . = ALIGN(4);
 
     .stack (NOLOAD):
diff --git a/firmware/target/mips/ingenic_jz47xx/crt0.S b/firmware/target/mips/ingenic_jz47xx/crt0.S
index 17cd2b0405..b73a43d8f2 100644
--- a/firmware/target/mips/ingenic_jz47xx/crt0.S
+++ b/firmware/target/mips/ingenic_jz47xx/crt0.S
@@ -40,7 +40,7 @@
 
     .text
 
-    .extern system_main
+    .extern system_early_init
     .extern main
     .global _start
 
@@ -139,6 +139,19 @@ _iram_loop:
     bne    t1, t2, _iram_loop
     sw     t3, -4(t1)
 
+#ifdef HAVE_INIT_ATTR
+    /* Copy init code */
+    la      t0, _initcopy
+    la      t1, _initstart
+    la      t2, _initend
+_init_loop:
+    lw     t3, 0(t0)
+    addiu  t1, 4
+    addiu  t0, 4
+    bne    t1, t2, _init_loop
+    sw     t3, -4(t1)
+#endif
+
     /*
       ----------------------------------------------------
        Clear BSS section
@@ -183,7 +196,7 @@ _irq_stack_loop:
        Jump to C code
       ----------------------------------------------------
     */
-    jal     system_main  /* Init clocks etc first */
+    jal     system_early_init  /* Init clocks etc first */
     ssnop
     j       main
     move    ra, zero     /* init backtrace root */
diff --git a/firmware/target/mips/ingenic_jz47xx/system-jz4740.c b/firmware/target/mips/ingenic_jz47xx/system-jz4740.c
index d2e39c0982..5aff144327 100644
--- a/firmware/target/mips/ingenic_jz47xx/system-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/system-jz4740.c
@@ -434,7 +434,7 @@ static void sdram_init(void)
 }
 
 /* Gets called *before* main */
-void ICODE_ATTR system_main(void)
+void ICODE_ATTR system_early_init(void)
 {
     int i;
 
diff --git a/firmware/target/mips/ingenic_jz47xx/system-jz4760.c b/firmware/target/mips/ingenic_jz47xx/system-jz4760.c
index 81d3470aae..ef99048812 100644
--- a/firmware/target/mips/ingenic_jz47xx/system-jz4760.c
+++ b/firmware/target/mips/ingenic_jz47xx/system-jz4760.c
@@ -533,7 +533,7 @@ static void serial_setbrg(void)
     *uart_lcr = tmp;
 }
 
-int serial_preinit(void)
+static int serial_preinit(void);
 {
     volatile u8 *uart_fcr = (volatile u8 *)(CFG_UART_BASE + OFF_FCR);
     volatile u8 *uart_lcr = (volatile u8 *)(CFG_UART_BASE + OFF_LCR);
@@ -569,7 +569,7 @@ int serial_preinit(void)
 #define cpu_frequency CPU_FREQ
 #endif
 
-void usb_preinit(void)
+static void usb_preinit(void)
 {
     /* Clear ECS bit of CPCCR, 0:clock source is EXCLK, 1:clock source is EXCLK/2 */
     REG_CPM_CPCCR &= ~CPCCR_ECS;
@@ -621,7 +621,7 @@ void usb_preinit(void)
     udelay(300);
 }
 
-void dma_preinit(void)
+static void dma_preinit(void)
 {
     __cpm_start_mdma();
     __cpm_start_dmac();
@@ -636,7 +636,7 @@ void dma_preinit(void)
 }
 
 /* Gets called *before* main */
-void ICODE_ATTR system_main(void)
+void ICODE_ATTR system_early_init(void)
 {
     int i;