[PATCH] CRIS update: misc patches

* Start threads with IRQs enabled.
* Move symbol exports to arch specific file.
* Prepare for real command line in the future.
* Handle csum for partition that crosses flash boundary.
* Set utsname.

Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 46 insertions, 9 deletions

diff --git a/arch/cris/arch-v10/boot/compressed/head.S b/arch/cris/arch-v10/boot/compressed/head.S
index 4cbdd4b1d9d6..e73f44c998d9 100644
--- a/arch/cris/arch-v10/boot/compressed/head.S
+++ b/arch/cris/arch-v10/boot/compressed/head.S
@@ -13,7 +13,8 @@
 #include <asm/arch/sv_addr_ag.h>
 
 #define RAM_INIT_MAGIC 0x56902387
-        
+#define COMMAND_LINE_MAGIC 0x87109563
+
         ;; Exported symbols
         
         .globl  _input_data
@@ -88,6 +89,12 @@ basse:	move.d	pc, r5
         cmp.d   r2, r1
         bcs     1b
         nop
+
+        ;;  Save command line magic and address.
+        move.d  _cmd_line_magic, $r12
+        move.d  $r10, [$r12]
+        move.d  _cmd_line_addr, $r12
+        move.d  $r11, [$r12]
         
         ;; Do the decompression and save compressed size in _inptr
 
@@ -98,7 +105,13 @@ basse:	move.d	pc, r5
 
         move.d  [_input_data], r9       ; flash address of compressed kernel
         add.d   [_inptr], r9            ; size of compressed kernel
-         
+
+        ;; Restore command line magic and address.
+        move.d  _cmd_line_magic, $r10
+        move.d  [$r10], $r10
+        move.d  _cmd_line_addr, $r11
+        move.d  [$r11], $r11
+
         ;; Enter the decompressed kernel
         move.d  RAM_INIT_MAGIC, r8      ; Tell kernel that DRAM is initialized
         jump    0x40004000      ; kernel is linked to this address
@@ -107,5 +120,8 @@ basse:	move.d	pc, r5
 
 _input_data:
         .dword  0               ; used by the decompressor
-
+_cmd_line_magic:
+        .dword 0
+_cmd_line_addr:
+        .dword 0
 #include "../../lib/hw_settings.S"
diff --git a/arch/cris/arch-v10/boot/rescue/head.S b/arch/cris/arch-v10/boot/rescue/head.S
index 8689ea972c46..addb2194de0f 100644
--- a/arch/cris/arch-v10/boot/rescue/head.S
+++ b/arch/cris/arch-v10/boot/rescue/head.S
@@ -1,4 +1,4 @@
-/* $Id: head.S,v 1.6 2003/04/09 08:12:43 pkj Exp $
+/* $Id: head.S,v 1.7 2005/03/07 12:11:06 starvik Exp $
  * 
  * Rescue code, made to reside at the beginning of the
  * flash-memory. when it starts, it checks a partition
@@ -121,12 +121,13 @@
         ;; 0x80000000 if loaded in flash (as it should be)
         ;; since etrax actually starts at address 2 when booting from flash, we
         ;; put a nop (2 bytes) here first so we dont accidentally skip the di
-        
+
         nop     
         di
 
         jump    in_cache        ; enter cached area instead
-in_cache:       
+in_cache:
+
 
         ;; first put a jump test to give a possibility of upgrading the rescue code
         ;; without erasing/reflashing the sector. we put a longword of -1 here and if
@@ -325,9 +326,29 @@ flash_ok:
         ;; result will be in r0
 checksum:
         moveq   0, $r0
-1:      addu.b  [$r1+], $r0
-        subq    1, $r2
-        bne     1b
+        moveq   CONFIG_ETRAX_FLASH1_SIZE, $r6
+
+        ;; If the first physical flash memory is exceeded wrap to the second one.
+        btstq   26, $r1         ; Are we addressing first flash?
+        bpl     1f
+        nop
+        clear.d $r6
+
+1:      test.d  $r6             ; 0 = no wrapping
+        beq     2f
+        nop
+        lslq    20, $r6         ; Convert MB to bytes
+        sub.d   $r1, $r6
+
+2:      addu.b  [$r1+], $r0
+        subq    1, $r6          ; Flash memory left
+        beq     3f
+        subq    1, $r2          ; Length left
+        bne     2b
         nop
         ret
         nop
+
+3:      move.d  MEM_CSE1_START, $r1 ; wrap to second flash
+        ba      2b
+        nop