1 files changed, 21 insertions, 3 deletions

diff --git a/arch/m32r/boot/setup.S b/arch/m32r/boot/setup.S
index 5d256434b4ad..398542507d84 100644
--- a/arch/m32r/boot/setup.S
+++ b/arch/m32r/boot/setup.S
@@ -1,11 +1,10 @@
 /*
  *  linux/arch/m32r/boot/setup.S -- A setup code.
  *
- *  Copyright (C) 2001, 2002  Hiroyuki Kondo, Hirokazu Takata,
- *  and Hitoshi Yamamoto
+ *  Copyright (C) 2001-2005   Hiroyuki Kondo, Hirokazu Takata,
+ *                            Hitoshi Yamamoto, Hayato Fujiwara
  *
  */
-/* $Id$ */
 
 #include <linux/linkage.h>
 #include <asm/segment.h>
@@ -80,6 +79,20 @@ ENTRY(boot)
         ldi     r1, #0x101              ; cache on (with invalidation)
 ;       ldi     r1, #0x00               ; cache off
         st      r1, @r0
+#elif defined(CONFIG_CHIP_M32104)
+        ldi     r0, #-96                ; DNCR0
+        seth    r1, #0x0060             ;  from 0x00600000
+        or3     r1, r1, #0x0005         ;  size 2MB
+        st      r1, @r0
+        seth    r1, #0x0100             ;  from 0x01000000
+        or3     r1, r1, #0x0003         ;  size 16MB
+        st      r1, @+r0
+        seth    r1, #0x0200             ;  from 0x02000000
+        or3     r1, r1, #0x0002         ;  size 32MB
+        st      r1, @+r0
+        ldi     r0, #-4              ;LDIMM     (r0, M32R_MCCR)
+        ldi     r1, #0x703              ; cache on (with invalidation)
+        st      r1, @r0
 #else
 #error unknown chip configuration
 #endif
@@ -115,10 +128,15 @@ mmu_on:
         st      r1, @(MATM_offset,r0)           ; Set MATM (T bit ON)
         ld      r0, @(MATM_offset,r0)           ; Check
 #else
+#if defined(CONFIG_CHIP_M32700)
         seth    r0,#high(M32R_MCDCAR)
         or3     r0,r0,#low(M32R_MCDCAR)
         ld24    r1,#0x8080
         st      r1,@r0
+#elif defined(CONFIG_CHIP_M32104)
+        LDIMM   (r2, eit_vector)                ; set EVB(cr5)
+        mvtc    r2, cr5
+#endif
 #endif  /* CONFIG_MMU */
         jmp     r13
         nop