Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / cris / arch-v10 / boot / compressed / head.S

diff --git a/arch/cris/arch-v10/boot/compressed/head.S b/arch/cris/arch-v10/boot/compressed/head.S
index e73f44c..981fbae 100644 (file)
--- a/arch/cris/arch-v10/boot/compressed/head.S
+++ b/arch/cris/arch-v10/boot/compressed/head.S
@@ -8,7 +8,6 @@
  *
  */
 
-#include <linux/config.h>
 #define ASSEMBLER_MACROS_ONLY
 #include <asm/arch/sv_addr_ag.h>
 
@@ -16,77 +15,77 @@
 #define COMMAND_LINE_MAGIC 0x87109563
 
        ;; Exported symbols
-       
-       .globl  _input_data
 
-       
+       .globl  input_data
+
+
        .text
 
        nop
        di
 
 ;; We need to initialze DRAM registers before we start using the DRAM
-       
-       cmp.d   RAM_INIT_MAGIC, r8      ; Already initialized?
+
+       cmp.d   RAM_INIT_MAGIC, $r8     ; Already initialized?
        beq     dram_init_finished
        nop
-       
+
 #include "../../lib/dram_init.S"
-       
-dram_init_finished:    
-               
+
+dram_init_finished:
+
        ;; Initiate the PA and PB ports
 
-       move.b   CONFIG_ETRAX_DEF_R_PORT_PA_DATA, r0
-       move.b   r0, [R_PORT_PA_DATA]
+       move.b   CONFIG_ETRAX_DEF_R_PORT_PA_DATA, $r0
+       move.b   $r0, [R_PORT_PA_DATA]
 
-       move.b   CONFIG_ETRAX_DEF_R_PORT_PA_DIR, r0
-       move.b   r0, [R_PORT_PA_DIR]
+       move.b   CONFIG_ETRAX_DEF_R_PORT_PA_DIR, $r0
+       move.b   $r0, [R_PORT_PA_DIR]
 
-       move.b   CONFIG_ETRAX_DEF_R_PORT_PB_DATA, r0
-       move.b   r0, [R_PORT_PB_DATA]
+       move.b   CONFIG_ETRAX_DEF_R_PORT_PB_DATA, $r0
+       move.b   $r0, [R_PORT_PB_DATA]
 
-       move.b   CONFIG_ETRAX_DEF_R_PORT_PB_DIR, r0
-       move.b   r0, [R_PORT_PB_DIR]
+       move.b   CONFIG_ETRAX_DEF_R_PORT_PB_DIR, $r0
+       move.b   $r0, [R_PORT_PB_DIR]
 
        ;; Setup the stack to a suitably high address.
        ;; We assume 8 MB is the minimum DRAM in an eLinux
        ;; product and put the sp at the top for now.
 
-       move.d  0x40800000, sp
+       move.d  0x40800000, $sp
 
        ;; Figure out where the compressed piggyback image is
        ;; in the flash (since we wont try to copy it to DRAM
        ;; before unpacking). It is at _edata, but in flash.
        ;; Use (_edata - basse) as offset to the current PC.
-       
-basse: move.d  pc, r5
-       and.d   0x7fffffff, r5  ; strip any non-cache bit
-       subq    2, r5           ; compensate for the move.d pc instr
-       move.d  r5, r0          ; save for later - flash address of 'basse'
-       add.d   _edata, r5
-       sub.d   basse, r5       ; r5 = flash address of '_edata'
-       
+
+basse: move.d  $pc, $r5
+       and.d   0x7fffffff, $r5 ; strip any non-cache bit
+       subq    2, $r5          ; compensate for the move.d $pc instr
+       move.d  $r5, $r0                ; save for later - flash address of 'basse'
+       add.d   _edata, $r5
+       sub.d   basse, $r5      ; $r5 = flash address of '_edata'
+
        ;; Copy text+data to DRAM
-       
-       move.d  basse, r1       ; destination
-       move.d  _edata, r2      ; end destination
-1:     move.w  [r0+], r3
-       move.w  r3, [r1+]
-       cmp.d   r2, r1
+
+       move.d  basse, $r1      ; destination
+       move.d  _edata, $r2     ; end destination
+1:     move.w  [$r0+], $r3
+       move.w  $r3, [$r1+]
+       cmp.d   $r2, $r1
        bcs     1b
        nop
 
-       move.d  r5, [_input_data] ; for the decompressor
+       move.d  $r5, [input_data] ; for the decompressor
 
 
        ;; Clear the decompressors BSS (between _edata and _end)
-       
-       moveq   0, r0
-       move.d  _edata, r1
-       move.d  _end, r2
-1:     move.w  r0, [r1+]
-       cmp.d   r2, r1
+
+       moveq   0, $r0
+       move.d  _edata, $r1
+       move.d  _end, $r2
+1:     move.w  $r0, [$r1+]
+       cmp.d   $r2, $r1
        bcs     1b
        nop
 
@@ -95,16 +94,16 @@ basse:      move.d  pc, r5
        move.d  $r10, [$r12]
        move.d  _cmd_line_addr, $r12
        move.d  $r11, [$r12]
-       
-       ;; Do the decompression and save compressed size in _inptr
 
-       jsr     _decompress_kernel
-       
-       ;; Put start address of root partition in r9 so the kernel can use it
+       ;; Do the decompression and save compressed size in inptr
+
+       jsr     decompress_kernel
+
+       ;; Put start address of root partition in $r9 so the kernel can use it
        ;; when mounting from flash
 
-       move.d  [_input_data], r9       ; flash address of compressed kernel
-       add.d   [_inptr], r9            ; size of compressed kernel
+       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
@@ -113,12 +112,12 @@ basse:    move.d  pc, r5
        move.d  [$r11], $r11
 
        ;; Enter the decompressed kernel
-       move.d  RAM_INIT_MAGIC, r8      ; Tell kernel that DRAM is initialized
+       move.d  RAM_INIT_MAGIC, $r8     ; Tell kernel that DRAM is initialized
        jump    0x40004000      ; kernel is linked to this address
-       
+
        .data
 
-_input_data:
+input_data:
        .dword  0               ; used by the decompressor
 _cmd_line_magic:
        .dword 0