---

yaml --- r: 146764 b: refs/heads/master c: 20b27fa h: refs/heads/master v: v3
git-mirror · May 9, 2009 · 71b26cd · 71b26cd
1 parent b746a39
commit 71b26cd
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 71 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b022d07a0fd2ce02d4456b732c674ff1d16f5ce
+refs/heads/master: 20b27fa33743c6ef77a1248421fab51e8bf21a25
diff --git a/trunk/arch/sh/boot/compressed/Makefile_64 b/trunk/arch/sh/boot/compressed/Makefile_64
@@ -14,8 +14,7 @@
 targets		:= vmlinux vmlinux.bin vmlinux.bin.gz \
 		   head_64.o misc_64.o cache.o piggy.o
 
-OBJECTS		:= $(obj)/vmlinux_64.lds $(obj)/head_64.o $(obj)/misc_64.o \
-		   $(obj)/cache.o
+OBJECTS		:= $(obj)/head_64.o $(obj)/misc_64.o $(obj)/cache.o
 
 #
 # ZIMAGE_OFFSET is the load offset of the compression loader

diff --git a/trunk/arch/sh/boot/compressed/head_64.S b/trunk/arch/sh/boot/compressed/head_64.S
@@ -14,6 +14,7 @@
  *   Copyright (C) 2002 Stuart Menefy (stuart.menefy@st.com)
  */
 #include <asm/cache.h>
+#include <asm/tlb.h>
 #include <cpu/mmu_context.h>
 #include <cpu/registers.h>
 
@@ -33,11 +34,7 @@
 #define	ICCR0_INIT_VAL	ICCR0_ON | ICCR0_ICI		/* ICE + ICI */
 #define	ICCR1_INIT_VAL	ICCR1_NOLOCK			/* No locking */
 
-#if 1
 #define	OCCR0_INIT_VAL	OCCR0_ON | OCCR0_OCI | OCCR0_WB	/* OCE + OCI + WB */
-#else
-#define	OCCR0_INIT_VAL	OCCR0_OFF
-#endif
 #define	OCCR1_INIT_VAL	OCCR1_NOLOCK			/* No locking */
 
 	.text

diff --git a/trunk/arch/sh/boot/compressed/vmlinux_64.lds b/trunk/arch/sh/boot/compressed/vmlinux_64.lds