4 files changed, 14 insertions, 63 deletions

diff --git a/firmware/test/kernel/Makefile b/firmware/test/kernel/Makefile
index 0f9f284a10..cec39b1d49 100644
--- a/firmware/test/kernel/Makefile
+++ b/firmware/test/kernel/Makefile
@@ -6,10 +6,15 @@ OC    = sh-elf-objcopy
 
 INCLUDES=-I../../ -I../../drivers
 
-CFLAGS = -g -O -Wall -m1 -save-temps -nostdlib -Wstrict-prototypes -fomit-frame-pointer -fschedule-insns -fno-builtin $(INCLUDES)
+# Pick a target to build for
+#TARGET = -DARCHOS_PLAYER=1
+TARGET = -DARCHOS_PLAYER_OLD=1
+#TARGET = -DARCHOS_RECORDER=1
+
+CFLAGS = -g -O -Wall -m1 -save-temps -nostdlib -Wstrict-prototypes -fomit-frame-pointer -fschedule-insns -fno-builtin $(INCLUDES) $(TARGET)
 AFLAGS += -small -relax
 
-OBJS= crt0.o main.o ../../thread.o ../../debug.o
+OBJS= ../../crt0.o ../../drivers/lcd.o ../../system.o main.o ../../thread.o ../../debug.o
 
 %.o: %.S
         $(CC) -o $@ $(CFLAGS) $(INCLUDES) $(DEFS) -c $<
diff --git a/firmware/test/kernel/app.lds b/firmware/test/kernel/app.lds
index 8a31ee7a13..2aa374f8c1 100644
--- a/firmware/test/kernel/app.lds
+++ b/firmware/test/kernel/app.lds
@@ -6,8 +6,7 @@ SECTIONS
     {
         *(.vectors)
         . = ALIGN(0x200);
-        crt0.o(.text)
-        *(.rodata)
+        *(.init.text)
     }
 
     .text :
@@ -17,9 +16,15 @@ SECTIONS
 
     .data :
     {
+        *(.rodata)
         *(.data)
     }
 
+    .rodata :
+    {
+        *(.rodata)
+    }
+
     .bss :
     {
         *(.bss)
diff --git a/firmware/test/kernel/crt0.S b/firmware/test/kernel/crt0.S
deleted file mode 100644
index 5f0ef2d64e..0000000000
--- a/firmware/test/kernel/crt0.S
+++ /dev/null
@@ -1,49 +0,0 @@
-        .section .text
-        .global start
-start:
-        mov.l   stack_k,r15
-
-        ! zero out bss
-        mov.l   edata_k,r0
-        mov.l   end_k,r1
-        mov     #0,r2
-start_l:
-         mov.l  r2,@r0
-        add     #4,r0
-        cmp/ge  r0,r1
-        bt      start_l
-        nop
-
-#if defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY)
-        mov.l set_fpscr_k, r1
-        jsr @r1
-        mov #0,r4
-        lds r3,fpscr
-#endif /*  defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY__) */
-
-        ! call the mainline     
-        mov.l   main_k,r0
-        jsr     @r0
-        nop
-.hoo:
-    bra .hoo
-
-        .align 2
-#if defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY__)
-set_fpscr_k:
-        .long   ___set_fpscr
-#endif /*  defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(SH4_SINGLE_ONLY) */
-stack_k:
-        .long   _stack  
-edata_k:
-        .long   _edata
-end_k:
-        .long   _end
-main_k:
-        .long   _main
-
-#ifdef __ELF__
-        .section .stack,"aw"
-#else
-        .section .stack
-#endif
diff --git a/firmware/test/kernel/main.c b/firmware/test/kernel/main.c
index 7e0bd3e3f8..5ac24a7971 100644
--- a/firmware/test/kernel/main.c
+++ b/firmware/test/kernel/main.c
@@ -70,13 +70,3 @@ void t2(void)
       switch_thread();
    }
 }
-
-extern const void stack(void);
-
-const void* vectors[] __attribute__ ((section (".vectors"))) = 
-{
-   main,        /* Power-on reset */
-   stack,       /* Power-on reset (stack pointer) */
-   main,        /* Manual reset */
-   stack        /* Manual reset (stack pointer) */
-};