* Patch by Yusdi Santoso, 22 Oct 2004:

[u-boot] / include / asm-ppc / processor.h

diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h
index f036b682859387ab23122b0ac065a5d00635a1da..8dbcc4750e3d570a5c1fca7710e91950810ca7f1 100644 (file)
--- a/include/asm-ppc/processor.h
+++ b/include/asm-ppc/processor.h
@@ -296,6 +296,11 @@
 #define SPRN_SRR1      0x01B   /* Save/Restore Register 1 */
 #define SPRN_SRR2      0x3DE   /* Save/Restore Register 2 */
 #define SPRN_SRR3      0x3DF   /* Save/Restore Register 3 */
+#ifdef CONFIG_BOOKE
+#define SPRN_SVR       0x3FF   /* System Version Register */
+#else
+#define SPRN_SVR       0x11E   /* System Version Register */
+#endif
 #define SPRN_TBHI      0x3DC   /* Time Base High */
 #define SPRN_TBHU      0x3CC   /* Time Base High User-mode */
 #define SPRN_TBLO      0x3DD   /* Time Base Low */
@@ -496,6 +501,7 @@
 #if defined(CONFIG_E500)
 #define PIR    SPRN_PIR
 #endif
+#define SVR    SPRN_SVR        /* System-On-Chip Version Register */
 #define PVR    SPRN_PVR        /* Processor Version */
 #define RPA    SPRN_RPA        /* Required Physical Address Register */
 #define SDR1   SPRN_SDR1       /* MMU hash base register */
@@ -509,6 +515,7 @@
 #define SPRG3   SPRN_SPRG3
 #define SRR0   SPRN_SRR0       /* Save and Restore Register 0 */
 #define SRR1   SPRN_SRR1       /* Save and Restore Register 1 */
+#define SVR    SPRN_SVR        /* System Version Register */
 #define TBRL   SPRN_TBRL       /* Time Base Read Lower Register */
 #define TBRU   SPRN_TBRU       /* Time Base Read Upper Register */
 #define TBWL   SPRN_TBWL       /* Time Base Write Lower Register */
@@ -654,6 +661,23 @@
 #define   IOCR_SCS     0x00000002
 #define   IOCR_SPC     0x00000001
 
+/* System-On-Chip Version Register */
+
+/* System-On-Chip Version Register (SVR) field extraction */
+
+#define SVR_VER(svr)   (((svr) >> 16) & 0xFFFF) /* Version field */
+#define SVR_REV(svr)   (((svr) >>  0) & 0xFFFF) /* Revision field */
+
+#define SVR_CID(svr)   (((svr) >> 28) & 0x0F)   /* Company or manufacturer ID */
+#define SVR_SOCOP(svr) (((svr) >> 22) & 0x3F)   /* SOC integration options */
+#define SVR_SID(svr)   (((svr) >> 16) & 0x3F)   /* SOC ID */
+#define SVR_PROC(svr)  (((svr) >> 12) & 0x0F)   /* Process revision field */
+#define SVR_MFG(svr)   (((svr) >>  8) & 0x0F)   /* Manufacturing revision */
+#define SVR_MJREV(svr) (((svr) >>  4) & 0x0F)   /* Major SOC design revision indicator */
+#define SVR_MNREV(svr) (((svr) >>  0) & 0x0F)   /* Minor SOC design revision indicator */
+
+/* System-On-Chip Version Numbers (version field only) */
+#define SVR_MPC5200    0x8011
 
 /* Processor Version Register */
 
@@ -712,8 +736,11 @@
 #define PVR_7400        0x000C0000
 #define PVR_7410        0x800C0000
 #define PVR_7450        0x80000000
-#define PVR_8540        0x80200010
-#define PVR_8560        0x80200010
+
+#define PVR_85xx       0x80200000
+#define PVR_85xx_REV1  (PVR_85xx | 0x0010)
+#define PVR_85xx_REV2  (PVR_85xx | 0x0020)
+
 
 /*
  * For the 8xx processors, all of them report the same PVR family for
@@ -737,6 +764,34 @@
 #define PVR_8260_HIP4   0x80811014
 #define PVR_8260_HIP7   0x80822011
 #define PVR_8260_HIP7R1 0x80822013
+#define PVR_8260_HIP7RA        0x80822014
+
+
+/*
+ * System Version Register
+ */
+
+/* System Version Register (SVR) field extraction */
+
+#define SVR_VER(svr)   (((svr) >>  16) & 0xFFFF)       /* Version field */
+#define SVR_REV(svr)   (((svr) >>   0) & 0xFFFF)       /* Revison field */
+
+#define SVR_FAM(svr)   (((svr) >> 20) & 0xFFF) /* Family field */
+#define SVR_MEM(svr)   (((svr) >> 16) & 0xF)   /* Member field */
+
+#define SVR_MAJ(svr)   (((svr) >>  4) & 0xF)   /* Major revision field*/
+#define SVR_MIN(svr)   (((svr) >>  0) & 0xF)   /* Minor revision field*/
+
+
+/*
+ * SVR_VER() Version Values
+ */
+
+#define SVR_8540       0x8030
+#define SVR_8560       0x8070
+#define SVR_8555       0x8079
+#define SVR_8541       0x807A
+
 
 /* I am just adding a single entry for 8260 boards.  I think we may be
  * able to combine mbx, fads, rpxlite, bseip, and classic into a single
@@ -763,6 +818,7 @@
 #define _MACH_sandpoint 0x00004000     /* Motorola SPS Processor eval board */
 #define _MACH_tqm860   0x00008000      /* TQM860/L */
 #define _MACH_tqm8xxL  0x00010000      /* TQM8xxL */
+#define _MACH_hidden_dragon 0x00020000 /* Motorola Hidden Dragon eval board */
 
 
 /* see residual.h for these */
@@ -981,6 +1037,8 @@ void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
 #define have_of 0
 #elif defined(CONFIG_SANDPOINT)
 #define _machine _MACH_sandpoint
+#elif defined(CONFIG_HIDDEN_DRAGON)
+#define _machine _MACH_hidden_dragon
 #define have_of 0
 #else
 #error "Machine not defined correctly"