Patch by Sam Song, 09 Jun 2004:

[oweals/u-boot.git] / cpu / sa1100 / cpu.c

diff --git a/cpu/sa1100/cpu.c b/cpu/sa1100/cpu.c
index 370ea6cb96a482a84027388e7a42a72dc5549a32..34adf91ad1ba647d65a37346a545ca78d8afe51d 100644 (file)
--- a/cpu/sa1100/cpu.c
+++ b/cpu/sa1100/cpu.c
@@ -36,17 +36,15 @@
 int cpu_init (void)
 {
        /*
-        * setup up stack if necessary
+        * setup up stacks if necessary
         */
 #ifdef CONFIG_USE_IRQ
-       IRQ_STACK_START = _armboot_end +
-                       CONFIG_STACKSIZE + CONFIG_STACKSIZE_IRQ - 4;
-       FIQ_STACK_START = IRQ_STACK_START + CONFIG_STACKSIZE_FIQ;
-       _armboot_real_end = FIQ_STACK_START + 4;
-#else
-       _armboot_real_end = _armboot_end + CONFIG_STACKSIZE;
+       DECLARE_GLOBAL_DATA_PTR;
+
+       IRQ_STACK_START = _armboot_start - CFG_MALLOC_LEN - CFG_GBL_DATA_SIZE - 4;
+       FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
 #endif
-       return (0);
+       return 0;
 }
 
 int cleanup_before_linux (void)