Merge branch 'master' of git://git.denx.de/u-boot-sh

[u-boot] / cpu / blackfin / start.S

diff --git a/cpu/blackfin/start.S b/cpu/blackfin/start.S
index c4d52b4857930d8ed4b3b055c46b32ce10fdd701..9975a0c62f575c94ffee7ddeadf4fcb24295537e 100644 (file)
--- a/cpu/blackfin/start.S
+++ b/cpu/blackfin/start.S
@@ -1,7 +1,7 @@
 /*
  * U-boot - start.S Startup file for Blackfin u-boot
  *
- * Copyright (c) 2005-2007 Analog Devices Inc.
+ * Copyright (c) 2005-2008 Analog Devices Inc.
  *
  * This file is based on head.S
  * Copyright (c) 2003  Metrowerks/Motorola
@@ -49,8 +49,8 @@
 ENTRY(_start)
 
        /* Set our initial stack to L1 scratch space */
-       sp.l = LO(L1_SRAM_SCRATCH + L1_SRAM_SCRATCH_SIZE);
-       sp.h = HI(L1_SRAM_SCRATCH + L1_SRAM_SCRATCH_SIZE);
+       sp.l = LO(L1_SRAM_SCRATCH_END - 20);
+       sp.h = HI(L1_SRAM_SCRATCH_END - 20);
 
 #ifdef CONFIG_HW_WATCHDOG
 # ifndef CONFIG_HW_WATCHDOG_TIMEOUT_START
@@ -193,11 +193,8 @@ ENTRY(_start)
        p1.l = .Lenable_nested;
        p1.h = .Lenable_nested;
        [p0] = p1;
-       p2.l = LO(IMASK);
-       p2.h = HI(IMASK);
-       p3.l = LO(EVT_IVG15);
-       p3.h = HI(EVT_IVG15);
-       [p2] = p3;
+       r7 = EVT_IVG15 (z);
+       sti r7;
        raise 15;
        p4.l = .LWAIT_HERE;
        p4.h = .LWAIT_HERE;