[PATCH] CRIS update: new subarchitecture v32

New CRIS sub architecture named v32.

From: Dave Jones <davej@redhat.com>

	Fix swapped kmalloc args

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

3 files changed, 95 insertions, 0 deletions

diff --git a/arch/cris/arch-v32/boot/rescue/Makefile b/arch/cris/arch-v32/boot/rescue/Makefile
new file mode 100644
index 000000000000..f668a8198724
--- /dev/null
+++ b/arch/cris/arch-v32/boot/rescue/Makefile
@@ -0,0 +1,36 @@
+#
+# Makefile for rescue code
+#
+target = $(target_rescue_dir)
+src    = $(src_rescue_dir)
+
+CC = gcc-cris -mlinux -march=v32 $(LINUXINCLUDE)
+CFLAGS = -O2
+LD = gcc-cris -mlinux -march=v32 -nostdlib
+OBJCOPY = objcopy-cris
+OBJCOPYFLAGS = -O binary --remove-section=.bss
+
+all: $(target)/rescue.bin
+
+rescue: rescue.bin
+        # do nothing
+
+$(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
+        cp -p $(target)/rescue.bin $(objtree)
+
+$(target):
+        mkdir -p $(target)
+
+$(target)/head.o: $(src)/head.S
+        $(CC) -D__ASSEMBLY__ -c $< -o $*.o
+
+clean:
+        rm -f $(target)/*.o $(target)/*.bin
+
+fastdep:
+
+modules:
+
+modules-install:
diff --git a/arch/cris/arch-v32/boot/rescue/head.S b/arch/cris/arch-v32/boot/rescue/head.S
new file mode 100644
index 000000000000..61ede5f30f99
--- /dev/null
+++ b/arch/cris/arch-v32/boot/rescue/head.S
@@ -0,0 +1,39 @@
+/* $Id: head.S,v 1.4 2004/11/01 16:10:28 starvik Exp $
+ *
+ * This used to be the rescue code but now that is handled by the
+ * RedBoot based RFL instead. Nothing to see here, move along.
+ */
+
+#include <linux/config.h>
+#include <asm/arch/hwregs/reg_map_asm.h>
+#include <asm/arch/hwregs/config_defs_asm.h>
+
+        .text
+
+        ;; Start clocks for used blocks.
+        move.d REG_ADDR(config, regi_config, rw_clk_ctrl), $r1
+        move.d [$r1], $r0
+        or.d   REG_STATE(config, rw_clk_ctrl, cpu, yes) | \
+               REG_STATE(config, rw_clk_ctrl, bif, yes) | \
+               REG_STATE(config, rw_clk_ctrl, fix_io, yes), $r0
+        move.d $r0, [$r1]
+
+        ;; Copy 68KB NAND flash to Internal RAM (if NAND boot)
+        move.d 0x38004000, $r10
+        move.d 0x8000, $r11
+        move.d 0x11000, $r12
+        move.d copy_complete, $r13
+        and.d  0x000fffff, $r13
+        or.d   0x38000000, $r13
+
+#include "../../lib/nand_init.S"
+
+        ;; No NAND found
+        move.d  CONFIG_ETRAX_PTABLE_SECTOR, $r10
+        jump    $r10 ; Jump to decompresser
+        nop
+
+copy_complete:
+        move.d  0x38000000 + CONFIG_ETRAX_PTABLE_SECTOR, $r10
+        jump    $r10 ; Jump to decompresser
+        nop
diff --git a/arch/cris/arch-v32/boot/rescue/rescue.ld b/arch/cris/arch-v32/boot/rescue/rescue.ld
new file mode 100644
index 000000000000..42b11aa122b2
--- /dev/null
+++ b/arch/cris/arch-v32/boot/rescue/rescue.ld
@@ -0,0 +1,20 @@
+MEMORY
+        {
+        flash : ORIGIN = 0x00000000,
+                LENGTH = 0x00100000
+        }
+
+SECTIONS
+{
+        .text :
+        {
+                stext = . ;
+                *(.text)
+                etext = . ;
+        } > flash
+        .data :
+        {
+                *(.data)
+                edata = . ;
+        } > flash
+}