[Linux-mips-commits]CVS: linux/arch/mips Makefile,1.14,1.15 config.in,1.16,1.17

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

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

Modified Files:
	Makefile config.in 
Log Message:
Started on R5900 integration.. as well as some basic PS2 code..



Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile	2001/08/25 02:19:27	1.14
--- Makefile	2001/08/25 11:20:20	1.15
***************
*** 75,78 ****
--- 75,81 ----
  GCCFLAGS        += -mcpu=r5000 -mips2 -Wa,--trap
  endif
+ ifdef CONFIG_CPU_R5900
+ GCCFLAGS	+= -mcpu=r5900 -mips2 -Wa,--trap
+ endif
  ifdef CONFIG_CPU_NEVADA
  # Cannot use -mmad with currently recommended tools
***************
*** 295,298 ****
--- 298,310 ----
  SUBDIRS       += arch/mips/au1000/pb1000 arch/mips/au1000/common
  LOADADDR      += 0x80100000
+ endif
+ 
+ #
+ # Sony PlayStation 2
+ #
+ ifdef CONFIG_PS2
+ CORE_FILES    += arch/mips/ps2/ps2.o
+ SUBDIRS       += arch/mips/ps2
+ LOADADDR      += 0x80010000
  endif
  

Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** config.in	2001/08/23 19:13:56	1.16
--- config.in	2001/08/25 11:20:20	1.17
***************
*** 46,49 ****
--- 46,50 ----
           Model-500/510 CONFIG_NINO_16MB" CONFIG_NINO_8MB
     fi
+    bool 'Support for Sony PlayStation 2' CONFIG_PS2
  fi
  bool 'Support for Mips Magnum 4000' CONFIG_MIPS_MAGNUM_4000
***************
*** 246,249 ****
--- 247,253 ----
     define_bool CONFIG_PC_KEYB y
  fi
+ if [ "$CONFIG_PS2" = "y" ]; then
+    define_bool CONFIG_PC_KEYB y
+ fi
  
  if [ "$CONFIG_ISA" != "y" ]; then
***************
*** 283,286 ****
--- 287,291 ----
  	 R5000 CONFIG_CPU_R5000	\
  	 R5432 CONFIG_CPU_R5432 \
+ 	 R5900 CONFIG_CPU_R5900 \
  	 RM7000 CONFIG_CPU_RM7000 \
  	 R52xx CONFIG_CPU_NEVADA \