From 5a97b2bf968c9d8724b20e4bca73990e82bb0713 Mon Sep 17 00:00:00 2001
From: skrll <skrll@NetBSD.org>
Date: Sun, 20 May 2012 18:08:05 +0000
Subject: [PATCH] Remove the ARM1156T2 bloat - it only has an MPU. Prompted by
 matt@

---
 sys/arch/arm/arm32/cpu.c      | 7 +++++--
 sys/arch/arm/include/armreg.h | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sys/arch/arm/arm32/cpu.c b/sys/arch/arm/arm32/cpu.c
index e17622e7333e..0c7df7a87065 100644
--- a/sys/arch/arm/arm32/cpu.c
+++ b/sys/arch/arm/arm32/cpu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.80 2012/05/20 17:58:32 skrll Exp $	*/
+/*	$NetBSD: cpu.c,v 1.81 2012/05/20 18:08:05 skrll Exp $	*/
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.80 2012/05/20 17:58:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.81 2012/05/20 18:08:05 skrll Exp $");
 
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -409,8 +409,11 @@ const struct cpuidtab cpuids[] = {
 	  pN_steppings },
 	{ CPU_ID_ARM1136JSR1,	CPU_CLASS_ARM11J,	"ARM1136J-S r1",
 	  pN_steppings },
+#if 0
+	/* The ARM1156T2-S only has a memory protection unit */
 	{ CPU_ID_ARM1156T2S,	CPU_CLASS_ARM11J,	"ARM1156T2-S r0",
 	  pN_steppings },
+#endif
 	{ CPU_ID_ARM1176JZS,	CPU_CLASS_ARM11J,	"ARM1176JZ-S r0",
 	  pN_steppings },
 
diff --git a/sys/arch/arm/include/armreg.h b/sys/arch/arm/include/armreg.h
index 58104af6c05b..f4d27ee2db29 100644
--- a/sys/arch/arm/include/armreg.h
+++ b/sys/arch/arm/include/armreg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: armreg.h,v 1.50 2012/05/20 17:58:32 skrll Exp $	*/
+/*	$NetBSD: armreg.h,v 1.51 2012/05/20 18:08:05 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Ben Harris
@@ -199,7 +199,7 @@
 #define CPU_ID_ARM11MPCORE	0x410fb020
 #define CPU_ID_ARM1136JS	0x4107b360
 #define CPU_ID_ARM1136JSR1	0x4117b360
-#define CPU_ID_ARM1156T2S	0x4107b560
+#define CPU_ID_ARM1156T2S	0x4107b560 /* MPU only */
 #define CPU_ID_ARM1176JZS	0x410fb760
 #define CPU_ID_CORTEXA8R1	0x411fc080
 #define CPU_ID_CORTEXA8R2	0x412fc080