5 files changed, 98 insertions, 54 deletions

diff --git a/arch/cris/arch-v10/boot/Makefile b/arch/cris/arch-v10/boot/Makefile
index fe6650368e6a..e5b105851108 100644
--- a/arch/cris/arch-v10/boot/Makefile
+++ b/arch/cris/arch-v10/boot/Makefile
@@ -1,12 +1,13 @@
 #
 # arch/cris/boot/Makefile
 #
+target = $(target_boot_dir)
+src    = $(src_boot_dir)
 
 zImage: compressed/vmlinuz
 
-compressed/vmlinuz: $(TOPDIR)/vmlinux
-        @$(MAKE) -C compressed vmlinuz
+compressed/vmlinuz:
+        @$(MAKE) -f $(src)/compressed/Makefile $(target_compressed_dir)/vmlinuz
 
 clean:
-        rm -f zImage tools/build compressed/vmlinux.out
-        @$(MAKE) -C compressed clean
+        @$(MAKE) -f $(src)/compressed/Makefile clean
diff --git a/arch/cris/arch-v10/boot/compressed/Makefile b/arch/cris/arch-v10/boot/compressed/Makefile
index 5f71c2c819e6..6584a44820f4 100644
--- a/arch/cris/arch-v10/boot/compressed/Makefile
+++ b/arch/cris/arch-v10/boot/compressed/Makefile
@@ -1,40 +1,45 @@
 #
-# linux/arch/etrax100/boot/compressed/Makefile
-#
-# create a compressed vmlinux image from the original vmlinux files and romfs
+# create a compressed vmlinuz image from the binary vmlinux.bin file
 #
+target = $(target_compressed_dir)
+src    = $(src_compressed_dir)
 
-CC = gcc-cris -melf -I $(TOPDIR)/include
+CC = gcc-cris -melf $(LINUXINCLUDE)
 CFLAGS = -O2
 LD = ld-cris
 OBJCOPY = objcopy-cris
 OBJCOPYFLAGS = -O binary --remove-section=.bss
-OBJECTS = head.o misc.o
+OBJECTS = $(target)/head.o $(target)/misc.o
 
 # files to compress
-SYSTEM = $(TOPDIR)/vmlinux.bin
+SYSTEM = $(objtree)/vmlinux.bin
 
-all: vmlinuz
+all: $(target_compressed_dir)/vmlinuz
 
-decompress.bin: $(OBJECTS)
-        $(LD) -T decompress.ld -o decompress.o $(OBJECTS)
-        $(OBJCOPY) $(OBJCOPYFLAGS) decompress.o decompress.bin
-# save it for mkprod in the topdir.
-        cp decompress.bin $(TOPDIR)
+$(target)/decompress.bin: $(OBJECTS)
+        $(LD) -T $(src)/decompress.ld -o $(target)/decompress.o $(OBJECTS)
+        $(OBJCOPY) $(OBJCOPYFLAGS) $(target)/decompress.o $(target)/decompress.bin
 
+# Create vmlinuz image in top-level build directory
+$(target_compressed_dir)/vmlinuz: $(target) piggy.img $(target)/decompress.bin
+        @echo "  COMPR   vmlinux.bin --> vmlinuz"
+        @cat $(target)/decompress.bin piggy.img > $(target_compressed_dir)/vmlinuz
+        @rm -f piggy.img
 
-vmlinuz: piggy.img decompress.bin
-        cat decompress.bin piggy.img > vmlinuz
-        rm -f piggy.img
+$(target)/head.o: $(src)/head.S
+        $(CC) -D__ASSEMBLY__ -traditional -c $< -o $@
 
-head.o: head.S
-        $(CC) -D__ASSEMBLY__ -traditional -c head.S -o head.o
+$(target)/misc.o: $(src)/misc.c
+        $(CC) -D__KERNEL__ -c $< -o $@
 
 # gzip the kernel image
 
 piggy.img: $(SYSTEM)
-        cat $(SYSTEM) | gzip -f -9 > piggy.img
+        @cat $(SYSTEM) | gzip -f -9 > piggy.img
+
+$(target):
+        mkdir -p $(target)
 
 clean:
-        rm -f piggy.img vmlinuz vmlinuz.o
+        rm -f piggy.img $(objtree)/vmlinuz
 
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/Makefile b/arch/cris/arch-v10/boot/rescue/Makefile
index e9f2ba2ad02c..8be9b3130312 100644
--- a/arch/cris/arch-v10/boot/rescue/Makefile
+++ b/arch/cris/arch-v10/boot/rescue/Makefile
@@ -1,52 +1,53 @@
 #
 # Makefile for rescue code
 #
-ifndef TOPDIR
-TOPDIR = ../../../..
-endif
-CC = gcc-cris -mlinux -I $(TOPDIR)/include
+target = $(target_rescue_dir)
+src    = $(src_rescue_dir)
+
+CC = gcc-cris -mlinux $(LINUXINCLUDE)
 CFLAGS = -O2
 LD = gcc-cris -mlinux -nostdlib
 OBJCOPY = objcopy-cris
 OBJCOPYFLAGS = -O binary --remove-section=.bss
 
-all: rescue.bin testrescue.bin kimagerescue.bin
-
-rescue: rescue.bin
-        # do nothing
+all: $(target)/rescue.bin $(target)/testrescue.bin $(target)/kimagerescue.bin
 
-rescue.bin: head.o
-        $(LD) -T rescue.ld -o rescue.o head.o
-        $(OBJCOPY) $(OBJCOPYFLAGS) rescue.o rescue.bin
-        cp rescue.bin $(TOPDIR)
+$(target)/rescue.bin: $(target) $(target)/head.o
+        $(LD) -T $(src)/rescue.ld -o $(target)/rescue.o $(target)/head.o
+        $(OBJCOPY) $(OBJCOPYFLAGS) $(target)/rescue.o $(target)/rescue.bin
+# Place a copy in top-level build directory
+        cp -p $(target)/rescue.bin $(objtree)
 
-testrescue.bin: testrescue.o
-        $(OBJCOPY) $(OBJCOPYFLAGS) testrescue.o tr.bin
+$(target)/testrescue.bin: $(target) $(target)/testrescue.o
+        $(OBJCOPY) $(OBJCOPYFLAGS) $(target)/testrescue.o tr.bin
 # Pad it to 784 bytes
         dd if=/dev/zero of=tmp2423 bs=1 count=784
         cat tr.bin tmp2423 >testrescue_tmp.bin
-        dd if=testrescue_tmp.bin of=testrescue.bin bs=1 count=784
+        dd if=testrescue_tmp.bin of=$(target)/testrescue.bin bs=1 count=784
         rm tr.bin tmp2423 testrescue_tmp.bin
 
-kimagerescue.bin: kimagerescue.o
-        $(OBJCOPY) $(OBJCOPYFLAGS) kimagerescue.o ktr.bin
+$(target)/kimagerescue.bin: $(target) $(target)/kimagerescue.o
+        $(OBJCOPY) $(OBJCOPYFLAGS) $(target)/kimagerescue.o ktr.bin
 # Pad it to 784 bytes, that's what the rescue loader expects
         dd if=/dev/zero of=tmp2423 bs=1 count=784
         cat ktr.bin tmp2423 >kimagerescue_tmp.bin
-        dd if=kimagerescue_tmp.bin of=kimagerescue.bin bs=1 count=784
+        dd if=kimagerescue_tmp.bin of=$(target)/kimagerescue.bin bs=1 count=784
         rm ktr.bin tmp2423 kimagerescue_tmp.bin
 
-head.o: head.S
+$(target):
+        mkdir -p $(target)
+
+$(target)/head.o: $(src)/head.S
         $(CC) -D__ASSEMBLY__ -traditional -c $< -o $*.o
 
-testrescue.o: testrescue.S
+$(target)/testrescue.o: $(src)/testrescue.S
         $(CC) -D__ASSEMBLY__ -traditional -c $< -o $*.o
 
-kimagerescue.o: kimagerescue.S
+$(target)/kimagerescue.o: $(src)/kimagerescue.S
         $(CC) -D__ASSEMBLY__ -traditional -c $< -o $*.o
 
 clean:
-        rm -f *.o *.bin
+        rm -f $(target)/*.o $(target)/*.bin
 
 fastdep:
 
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