[Linux-mips-commits]CVS: linux/include/asm-mips bootinfo.h,1.6,1.7 cpu.h,1.7,1.8

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv9789/include/asm-mips

Modified Files:
	bootinfo.h cpu.h 
Log Message:
Started on R5900 integration.. as well as some basic PS2 code..



Index: bootinfo.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/bootinfo.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** bootinfo.h	2001/08/23 19:13:56	1.6
--- bootinfo.h	2001/08/25 11:20:20	1.7
***************
*** 28,41 ****
  #define MACH_GROUP_ITE         13 /* ITE Semi Eval Boards                     */
  #define MACH_GROUP_PHILIPS     14
! #define MACH_GROUP_GLOBESPAN   15 /* Globespan PVR Referrence Board           */
  #define MACH_GROUP_SIBYTE      16 /* Sibyte Eval Boards                       */
  #define MACH_GROUP_TOSHIBA     17 /* Toshiba Reference Systems TSBREF         */
  #define MACH_GROUP_ALCHEMY     18 /* Alchemy Semi Eval Boards*/
  #define MACH_GROUP_NEC_VR41XX  19 /* NEC Vr41xx based boards/gadgets 	      */
  
  #define GROUP_NAMES { "unknown", "Jazz", "Digital", "ARC", "SNI", "ACN",      \
  	"SGI", "Cobalt", "NEC DDB", "Baget", "Cosine", "Galileo", "Momentum", \
  	"ITE", "Philips", "Globepspan", "SiByte", "Toshiba", "Alchemy",	      \
! 	"NEC Vr41xx" }
  
  /*
--- 28,42 ----
  #define MACH_GROUP_ITE         13 /* ITE Semi Eval Boards                     */
  #define MACH_GROUP_PHILIPS     14
! #define MACH_GROUP_GLOBESPAN   15 /* Globespan PVR Reference Board            */
  #define MACH_GROUP_SIBYTE      16 /* Sibyte Eval Boards                       */
  #define MACH_GROUP_TOSHIBA     17 /* Toshiba Reference Systems TSBREF         */
  #define MACH_GROUP_ALCHEMY     18 /* Alchemy Semi Eval Boards*/
  #define MACH_GROUP_NEC_VR41XX  19 /* NEC Vr41xx based boards/gadgets 	      */
+ #define MACH_GROUP_EE          20 /* Emotion Engine (Sony PlayStation 2)      */
  
  #define GROUP_NAMES { "unknown", "Jazz", "Digital", "ARC", "SNI", "ACN",      \
  	"SGI", "Cobalt", "NEC DDB", "Baget", "Cosine", "Galileo", "Momentum", \
  	"ITE", "Philips", "Globepspan", "SiByte", "Toshiba", "Alchemy",	      \
! 	"NEC Vr41xx", "Emotion Engine" }
  
  /*
***************
*** 207,210 ****
--- 208,219 ----
  
  /*
+  * Valid machtype for group EE
+  */
+ #define MACH_T10000	0	/* DTL-10000 */
+ #define MACH_PS2	1	/* PlayStation 2 */
+ 
+ #define GROUP_EE_NAMES { "T10000", "PS2" }
+ 
+ /*
   * Valid cputype values
   */
***************
*** 250,254 ****
  #define CPU_4KSC		39
  #define CPU_VR41XX		40
! #define CPU_LAST		40
  
  
--- 259,264 ----
  #define CPU_4KSC		39
  #define CPU_VR41XX		40
! #define CPU_R5900		41
! #define CPU_LAST		41
  
  
***************
*** 259,263 ****
          "R5000A", "R4640", "Nevada", "RM7000", "R5432", "MIPS 4Kc",          \
          "MIPS 5Kc", "R4310", "SiByte SB1", "TX3912", "TX3922", "TX3927",     \
! 	"Au1000", "MIPS 4KEc", "MIPS 4KSc", "NEC Vr41xx" }
  
  #define COMMAND_LINE_SIZE	256
--- 269,273 ----
          "R5000A", "R4640", "Nevada", "RM7000", "R5432", "MIPS 4Kc",          \
          "MIPS 5Kc", "R4310", "SiByte SB1", "TX3912", "TX3922", "TX3927",     \
! 	"Au1000", "MIPS 4KEc", "MIPS 4KSc", "NEC Vr41xx", "R5900" }
  
  #define COMMAND_LINE_SIZE	256

Index: cpu.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/cpu.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** cpu.h	2001/08/25 02:19:28	1.7
--- cpu.h	2001/08/25 11:20:20	1.8
***************
*** 39,43 ****
   */
  #define PRID_IMP_R2000		0x0100
! #define PRID_IMP_AU1000	0x0100
  #define PRID_IMP_R3000		0x0200		/* Same as R2000A  */
  #define PRID_IMP_R6000		0x0300		/* Same as R3000A  */
--- 39,43 ----
   */
  #define PRID_IMP_R2000		0x0100
! #define PRID_IMP_AU1000		0x0100
  #define PRID_IMP_R3000		0x0200		/* Same as R2000A  */
  #define PRID_IMP_R6000		0x0300		/* Same as R3000A  */
***************
*** 59,62 ****
--- 59,63 ----
  #define PRID_IMP_RM7000		0x2700
  #define PRID_IMP_NEVADA		0x2800		/* RM5260 ??? */
+ #define PRID_IMP_R5900		0x2e00
  #define PRID_IMP_R5432		0x5400
  #define PRID_IMP_4KC		0x8000