[Linux-mips-commits]CVS: linux/arch/mips/kernel setup.c,1.10,1.11

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

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

Modified Files:
	setup.c 
Log Message:
Started on R5900 integration.. as well as some basic PS2 code..



Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/setup.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** setup.c	2001/08/25 02:19:27	1.10
--- setup.c	2001/08/25 11:20:20	1.11
***************
*** 263,266 ****
--- 263,275 ----
  			mips_cpu.dcache.ways = 2;
  			break;
+ 		case PRID_IMP_R5900:
+ 			mips_cpu.cputype = CPU_R5900;
+ 			mips_cpu.isa_level = MIPS_CPU_ISA_III;
+ 			mips_cpu.options = MIPS_CPU_TLB | MIPS_CPU_FPU |
+ 					   MIPS_CPU_COUNTER | MIPS_CPU_DIVEC;
+ 			mips_cpu.tlbsize = 48;
+ 			mips_cpu.icache.ways = 2;
+ 			mips_cpu.dcache.ways = 2;
+ 			break;
  		case PRID_IMP_R6000:
  			mips_cpu.cputype = CPU_R6000;
***************
*** 529,533 ****
         	void nec_eagle_setup(void);
         	void nec_korva_setup(void);
! 
  	unsigned long bootmap_size;
  	unsigned long start_pfn, max_pfn, first_usable_pfn;
--- 538,543 ----
         	void nec_eagle_setup(void);
         	void nec_korva_setup(void);
! 	void ps2_setup(void);
! 	
  	unsigned long bootmap_size;
  	unsigned long start_pfn, max_pfn, first_usable_pfn;
***************
*** 651,654 ****
--- 661,669 ----
  	case MACH_GROUP_ALCHEMY:
  		au1000_setup();
+ 		break;
+ #endif
+ #ifdef CONFIG_PS2
+ 	case MACH_GROUP_EE:
+ 		ps2_setup();
  		break;
  #endif