Merge branch 'for-1.3.2-ver2'

[oweals/u-boot.git] / include / asm-ppc / e300.h

diff --git a/include/asm-ppc/e300.h b/include/asm-ppc/e300.h
index ff9512f203cd06d41f1ed9a125486471436c3b1b..de8239965aa169b51ae46bcefbc1ba092f94b154 100644 (file)
--- a/include/asm-ppc/e300.h
+++ b/include/asm-ppc/e300.h
@@ -6,19 +6,10 @@
 #ifndef        __E300_H__
 #define __E300_H__
 
-/*
- * e300 Processor Version & Revision Numbers
- */
-#define PVR_83xx 0x80830000
-#define PVR_8349_REV10 (PVR_83xx | 0x0010)
-#define PVR_8349_REV11 (PVR_83xx | 0x0011)
-#define PVR_8360_REV10 (PVR_83xx | 0x0020)
-#define PVR_8360_REV11 (PVR_83xx | 0x0020)
-
-#if defined(CONFIG_MPC832X)
-#undef PVR_83xx
-#define PVR_83xx 0x80840000
-#endif
+#define PVR_E300C1     0x80830000
+#define PVR_E300C2     0x80840000
+#define PVR_E300C3     0x80850000
+#define PVR_E300C4     0x80860000
 
 /*
  * Hardware Implementation-Dependent Register 0 (HID0)