[Gc-linux-cvs] linux/arch/powerpc/platforms Kconfig.cputype, 1.8, 1.9

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29988/arch/powerpc/platforms

Modified Files:
	Kconfig.cputype 
Log Message:
Forward to v.2.6.30.


Index: Kconfig.cputype
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/Kconfig.cputype,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Kconfig.cputype	25 Oct 2009 18:33:46 -0000	1.8
--- Kconfig.cputype	25 Oct 2009 18:45:35 -0000	1.9
***************
*** 58,64 ****
  endchoice
  
  config POWER4_ONLY
  	bool "Optimize for POWER4"
! 	depends on PPC64
  	default n
  	---help---
--- 58,72 ----
  endchoice
  
+ # Until we have a choice of exclusive CPU types on 64-bit, we always
+ # use PPC_BOOK3S. On 32-bit, this is equivalent to 6xx which is
+ # "classic" MMU
+ 
+ config PPC_BOOK3S
+        def_bool y
+        depends on PPC64 || 6xx
+ 
  config POWER4_ONLY
  	bool "Optimize for POWER4"
! 	depends on PPC64 && PPC_BOOK3S
  	default n
  	---help---
***************
*** 69,82 ****
  config POWER3
  	bool
! 	depends on PPC64
  	default y if !POWER4_ONLY
  
  config POWER4
! 	depends on PPC64
  	def_bool y
  
  config TUNE_CELL
  	bool "Optimize for Cell Broadband Engine"
! 	depends on PPC64
  	help
  	  Cause the compiler to optimize for the PPE of the Cell Broadband
--- 77,90 ----
  config POWER3
  	bool
! 	depends on PPC64 && PPC_BOOK3S
  	default y if !POWER4_ONLY
  
  config POWER4
! 	depends on PPC64 && PPC_BOOK3S
  	def_bool y
  
  config TUNE_CELL
  	bool "Optimize for Cell Broadband Engine"
! 	depends on PPC64 && PPC_BOOK3S
  	help
  	  Cause the compiler to optimize for the PPE of the Cell Broadband
***************
*** 148,152 ****
  config ALTIVEC
  	bool "AltiVec Support"
! 	depends on CLASSIC32 || POWER4
  	---help---
  	  This option enables kernel support for the Altivec extensions to the
--- 156,160 ----
  config ALTIVEC
  	bool "AltiVec Support"
! 	depends on 6xx || POWER4
  	---help---
  	  This option enables kernel support for the Altivec extensions to the
***************
*** 211,214 ****
--- 219,226 ----
  	depends on !PPC_STD_MMU
  
+ config PPC_BOOK3E_MMU
+ 	def_bool y
+ 	depends on FSL_BOOKE
+ 
  config PPC_MM_SLICES
  	bool