5 files changed, 24 insertions, 22 deletions

diff --git a/firmware/target/arm/s3c2440/crt0.S b/firmware/target/arm/s3c2440/crt0.S
index a05fd78fe9..7de2c46437 100644
--- a/firmware/target/arm/s3c2440/crt0.S
+++ b/firmware/target/arm/s3c2440/crt0.S
@@ -467,6 +467,7 @@ stackmunge:
     ldr     sp, =stackend
 
     /* Start the main function */
+    adr     lr, vectors
     ldr     pc, =main
 
     /* Should never get here, but let's restart in case (also needed for
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/ata-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/ata-target.h
index b010e3a4d4..54d0964560 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/ata-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/ata-target.h
@@ -21,6 +21,10 @@
 #ifndef ATA_TARGET_H
 #define ATA_TARGET_H
 
+#ifdef BOOTLOADER
+#define ATA_DRIVER_CLOSE
+#endif
+
 /* Plain C read & write loops */
 #define PREFER_C_READING
 #define PREFER_C_WRITING
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/kernel-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/kernel-meg-fx.c
index 6a750c32e2..6cabc8dc81 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/kernel-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/kernel-meg-fx.c
@@ -24,7 +24,7 @@
 #include "timer.h"
 #include "thread.h"
 
-static inline void tick_set(unsigned int interval_in_ms)
+void tick_start(unsigned int interval_in_ms)
 {
     /*
      * Based on default PCLK of 49.1568MHz - scaling chosen to give
@@ -49,11 +49,6 @@ static inline void tick_set(unsigned int interval_in_ms)
     TCON |= 1 << 21;
     /* reset manual bit */
     TCON &= ~(1 << 21);
-}
-
-void tick_start(unsigned int interval_in_ms)
-{
-    tick_set(interval_in_ms);
 
     /* interval mode */
     TCON |= 1 << 22;
@@ -65,24 +60,14 @@ void tick_start(unsigned int interval_in_ms)
 }
 
 #ifdef BOOTLOADER
-void delay(int ticks)
+void tick_stop(void)
 {
-    volatile unsigned long counter;
-
-    INTMSK |= TIMER4_MASK;
-
-    tick_set(1000 * ticks / HZ);
-
-    /* autoreload Off */
-    TCON &= ~(1 << 22);
-    /* start timer 4 */
-    TCON |= (1 << 20);
-
-    do {
-        counter = TCNTO4;
-    } while(counter > 0);
+    s3c_regset32(&INTMSK, TIMER4_MASK);
+    TCON &= ~(1 << 20);
+    SRCPND = TIMER4_MASK;
+    INTPND = TIMER4_MASK;
 }
-#endif /* BOOTLOADER */
+#endif
 
 void TIMER4(void)
 {
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c
index 6d8108be49..43e2c408a2 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c
@@ -143,6 +143,15 @@ void s3c_regclr32(volatile unsigned long *reg, unsigned long bits)
     s3c_regmod32(reg, 0, bits);
 }
 
+#ifdef BOOTLOADER
+void system_prepare_fw_start(void)
+{
+    tick_stop();
+    disable_interrupt(IRQ_FIQ_STATUS);
+    INTMSK = 0xFFFFFFFF;
+}
+#endif
+
 void system_init(void)
 {
     INTMSK = 0xFFFFFFFF;
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/system-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/system-target.h
index 43758ece08..320c595b99 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/system-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/system-target.h
@@ -28,6 +28,9 @@
 #define CPUFREQ_NORMAL  98784000
 #define CPUFREQ_MAX    296352000
 
+void system_prepare_fw_start(void);
+void tick_stop(void);
+
 /* Functions to set and clear regiser bits atomically */
 
 /* Set and clear register bits */