Module Name: src
Committed By: matt
Date: Sat Jun 18 17:06:52 UTC 2011
Modified Files:
src/sys/arch/powerpc/include/ibm4xx: cpu.h spr.h
Log Message:
Move PVR definitions to <powerpc/ibm4xx/spr.h>
No need to include <powerpc/cpu.h> in <powerpc/ib4xx/cpu.h>
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/include/ibm4xx/cpu.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/include/ibm4xx/spr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/include/ibm4xx/cpu.h
diff -u src/sys/arch/powerpc/include/ibm4xx/cpu.h:1.17 src/sys/arch/powerpc/include/ibm4xx/cpu.h:1.18
--- src/sys/arch/powerpc/include/ibm4xx/cpu.h:1.17 Fri Jun 17 19:03:03 2011
+++ src/sys/arch/powerpc/include/ibm4xx/cpu.h Sat Jun 18 17:06:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.17 2011/06/17 19:03:03 matt Exp $ */
+/* $NetBSD: cpu.h,v 1.18 2011/06/18 17:06:52 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -42,30 +42,6 @@
#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/dcr4xx.h>
-/* PVRs for different IBM CPUs */
-#define PVR_401A1 0x00210000
-#define PVR_401B2 0x00220000
-#define PVR_401C2 0x00230000
-#define PVR_401D2 0x00240000
-#define PVR_401E2 0x00250000
-#define PVR_401F2 0x00260000
-#define PVR_401G2 0x00270000
-
-#define PVR_403 0x00200000
-
-#define PVR_405GP 0x40110000
-#define PVR_405GP_PASS1 0x40110000 /* RevA */
-#define PVR_405GP_PASS2 0x40110040 /* RevB */
-#define PVR_405GP_PASS2_1 0x40110082 /* RevC */
-#define PVR_405GP_PASS3 0x401100c4 /* RevD */
-#define PVR_405GPR 0x50910000
-#define PVR_405GPR_REVB 0x50910951
-
-#define PVR_405D5X1 0x20010000 /* Virtex II Pro */
-#define PVR_405D5X2 0x20011000 /* Virtex 4 FX */
-
-#define PVR_405EX 0x12910000
-
#if defined(_KERNEL)
extern char bootpath[];
@@ -147,8 +123,6 @@
}
#endif /* _KERNEL */
-#include <powerpc/cpu.h>
-
/* Board info dictionary */
extern prop_dictionary_t board_properties;
extern void board_info_init(void);
Index: src/sys/arch/powerpc/include/ibm4xx/spr.h
diff -u src/sys/arch/powerpc/include/ibm4xx/spr.h:1.2 src/sys/arch/powerpc/include/ibm4xx/spr.h:1.3
--- src/sys/arch/powerpc/include/ibm4xx/spr.h:1.2 Thu Mar 18 13:47:04 2010
+++ src/sys/arch/powerpc/include/ibm4xx/spr.h Sat Jun 18 17:06:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: spr.h,v 1.2 2010/03/18 13:47:04 kiyohara Exp $ */
+/* $NetBSD: spr.h,v 1.3 2011/06/18 17:06:52 matt Exp $ */
#ifndef _POWERPC_IBM4XX_SPR_H_
#define _POWERPC_IBM4XX_SPR_H_
@@ -34,6 +34,30 @@
#define IBM405EP 0x5121
#define IBMSTB25 0x5151
+/* PVRs for different IBM CPUs */
+#define PVR_401A1 0x00210000
+#define PVR_401B2 0x00220000
+#define PVR_401C2 0x00230000
+#define PVR_401D2 0x00240000
+#define PVR_401E2 0x00250000
+#define PVR_401F2 0x00260000
+#define PVR_401G2 0x00270000
+
+#define PVR_403 0x00200000
+
+#define PVR_405GP 0x40110000
+#define PVR_405GP_PASS1 0x40110000 /* RevA */
+#define PVR_405GP_PASS2 0x40110040 /* RevB */
+#define PVR_405GP_PASS2_1 0x40110082 /* RevC */
+#define PVR_405GP_PASS3 0x401100c4 /* RevD */
+#define PVR_405GPR 0x50910000
+#define PVR_405GPR_REVB 0x50910951
+
+#define PVR_405D5X1 0x20010000 /* Virtex II Pro */
+#define PVR_405D5X2 0x20011000 /* Virtex 4 FX */
+
+#define PVR_405EX 0x12910000
+
#define SPR_ZPR 0x3b0 /* .4.. Zone Protection Register */
#define SPR_PID 0x3b1 /* .4.. Process ID */
#define SPR_MMUCR 0x3b2 /* .4.. MMU Control Register */
