Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the ARM1156T2 bloat - it only has an MPU. Prompted by matt@

This commit is contained in:
skrll 2012-05-20 18:08:05 +00:00
parent e75558347a
commit 5a97b2bf96
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/arch/arm/arm32/cpu.c
View File

@ -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 },

4
sys/arch/arm/include/armreg.h
View File

@ -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