From 5c45d9ed62675ec9b95f6d82f921ade6a2f35f95 Mon Sep 17 00:00:00 2001
From: uwe <uwe@NetBSD.org>
Date: Sat, 15 Mar 2008 22:48:58 +0000
Subject: [PATCH] defflag cache related options.

---
 sys/arch/sh3/conf/files.sh3  | 9 ++++++++-
 sys/arch/sh3/sh3/cache.c     | 7 ++++---
 sys/arch/sh3/sh3/cache_sh3.c | 6 ++++--
 sys/arch/sh3/sh3/cache_sh4.c | 6 ++++--
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/sys/arch/sh3/conf/files.sh3 b/sys/arch/sh3/conf/files.sh3
index 15dfca2083aa..2132f752f12a 100644
--- a/sys/arch/sh3/conf/files.sh3
+++ b/sys/arch/sh3/conf/files.sh3
@@ -1,4 +1,4 @@
-#	$NetBSD: files.sh3,v 1.39 2008/02/02 02:19:42 uwe Exp $
+#	$NetBSD: files.sh3,v 1.40 2008/03/15 22:48:58 uwe Exp $
 #
 
 defflag	opt_cputype.h		SH3 SH4
@@ -6,6 +6,13 @@ defflag	opt_cputype.h		SH3 SH4
 defparam	PCLOCK
 defflag	opt_kstack_debug.h	KSTACK_DEBUG
 
+defflag opt_cache.h		CACHE_DEBUG
+defflag opt_cache.h		SH4_CACHE_DISABLE_EMODE
+defflag opt_cache.h		SH4_CACHE_DISABLE_ICACHE
+defflag opt_cache.h		SH4_CACHE_DISABLE_DCACHE
+defflag opt_cache.h		SH4_CACHE_WB_U0_P0_P3
+defflag opt_cache.h		SH4_CACHE_WB_P1
+
 file	arch/sh3/sh3/db_disasm.c	ddb
 file	arch/sh3/sh3/db_interface.c	ddb | kgdb
 file	arch/sh3/sh3/db_memrw.c		ddb | kgdb
diff --git a/sys/arch/sh3/sh3/cache.c b/sys/arch/sh3/sh3/cache.c
index 5043ed08a893..d42084620e67 100644
--- a/sys/arch/sh3/sh3/cache.c
+++ b/sys/arch/sh3/sh3/cache.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cache.c,v 1.13 2007/11/06 01:33:00 uwe Exp $	*/
+/*	$NetBSD: cache.c,v 1.14 2008/03/15 22:48:58 uwe Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,8 +37,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.13 2007/11/06 01:33:00 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.14 2008/03/15 22:48:58 uwe Exp $");
 
+#include "opt_cache.h"
 #include "opt_memsize.h"	/* IOM_RAM_BEGIN */
 
 #include <sys/param.h>
@@ -147,7 +148,7 @@ sh_cache_information()
 	}
 
 	/* Write-through/back */
-	aprint_normal("cpu0: P0, U0, P3 write-%s; P1 write-%s\n",
+	aprint_normal("cpu0: U0, P0, P3 write-%s; P1 write-%s\n",
 	    sh_cache_write_through_p0_u0_p3 ? "through" : "back",
 	    sh_cache_write_through_p1 ? "through" : "back");
 }
diff --git a/sys/arch/sh3/sh3/cache_sh3.c b/sys/arch/sh3/sh3/cache_sh3.c
index 563996de2dab..8e485db36241 100644
--- a/sys/arch/sh3/sh3/cache_sh3.c
+++ b/sys/arch/sh3/sh3/cache_sh3.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cache_sh3.c,v 1.12 2006/03/04 01:13:35 uwe Exp $	*/
+/*	$NetBSD: cache_sh3.c,v 1.13 2008/03/15 22:48:58 uwe Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cache_sh3.c,v 1.12 2006/03/04 01:13:35 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cache_sh3.c,v 1.13 2008/03/15 22:48:58 uwe Exp $");
+
+#include "opt_cache.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/sh3/sh3/cache_sh4.c b/sys/arch/sh3/sh3/cache_sh4.c
index 1f7448d83fce..eeef93d6d97f 100644
--- a/sys/arch/sh3/sh3/cache_sh4.c
+++ b/sys/arch/sh3/sh3/cache_sh4.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cache_sh4.c,v 1.17 2007/03/29 01:51:49 uwe Exp $	*/
+/*	$NetBSD: cache_sh4.c,v 1.18 2008/03/15 22:48:58 uwe Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cache_sh4.c,v 1.17 2007/03/29 01:51:49 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cache_sh4.c,v 1.18 2008/03/15 22:48:58 uwe Exp $");
+
+#include "opt_cache.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>