[Gc-linux-cvs] linux/arch/powerpc/platforms Kconfig.cputype, 1.14, 1.15

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

Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/arch/powerpc/platforms

Modified Files:
	Kconfig.cputype 
Log Message:
Forward to v2.6.32.


Index: Kconfig.cputype
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/Kconfig.cputype,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Kconfig.cputype	9 Dec 2009 18:18:06 -0000	1.14
--- Kconfig.cputype	9 Dec 2009 18:40:09 -0000	1.15
***************
*** 58,70 ****
  endchoice
  
! config PPC_BOOK3S_64
! 	def_bool y
  	depends on PPC64
  	select PPC_FPU
  
  config PPC_BOOK3S
  	def_bool y
  	depends on PPC_BOOK3S_32 || PPC_BOOK3S_64
  
  config POWER4_ONLY
  	bool "Optimize for POWER4"
--- 58,90 ----
  endchoice
  
! choice
! 	prompt "Processor Type"
  	depends on PPC64
+ 	help
+ 	  There are two families of 64 bit PowerPC chips supported.
+ 	  The most common ones are the desktop and server CPUs
+ 	  (POWER3, RS64, POWER4, POWER5, POWER5+, POWER6, ...)
+ 
+ 	  The other are the "embedded" processors compliant with the
+ 	  "Book 3E" variant of the architecture
+ 
+ config PPC_BOOK3S_64
+ 	bool "Server processors"
  	select PPC_FPU
  
+ config PPC_BOOK3E_64
+ 	bool "Embedded processors"
+ 	select PPC_FPU # Make it a choice ?
+ 
+ endchoice
+ 
  config PPC_BOOK3S
  	def_bool y
  	depends on PPC_BOOK3S_32 || PPC_BOOK3S_64
  
+ config PPC_BOOK3E
+ 	def_bool y
+ 	depends on PPC_BOOK3E_64
+ 
  config POWER4_ONLY
  	bool "Optimize for POWER4"
***************
*** 126,130 ****
  config BOOKE
  	bool
! 	depends on E200 || E500 || 44x
  	default y
  
--- 146,150 ----
  config BOOKE
  	bool
! 	depends on E200 || E500 || 44x || PPC_BOOK3E
  	default y
  
***************
*** 224,230 ****
  	depends on !PPC_STD_MMU
  
  config PPC_BOOK3E_MMU
  	def_bool y
! 	depends on FSL_BOOKE
  
  config PPC_MM_SLICES
--- 244,258 ----
  	depends on !PPC_STD_MMU
  
+ config PPC_MMU_NOHASH_32
+ 	def_bool y
+ 	depends on PPC_MMU_NOHASH && PPC32
+ 
+ config PPC_MMU_NOHASH_64
+ 	def_bool y
+ 	depends on PPC_MMU_NOHASH && PPC64
+ 
  config PPC_BOOK3E_MMU
  	def_bool y
! 	depends on FSL_BOOKE || PPC_BOOK3E
  
  config PPC_MM_SLICES
***************
*** 253,262 ****
  config PPC_PERF_CTRS
         def_bool y
!        depends on PERF_COUNTERS && PPC_HAVE_PMU_SUPPORT
         help
!          This enables the powerpc-specific perf_counter back-end.
  
  config SMP
! 	depends on PPC_STD_MMU || FSL_BOOKE
  	bool "Symmetric multi-processing support"
  	---help---
--- 281,290 ----
  config PPC_PERF_CTRS
         def_bool y
!        depends on PERF_EVENTS && PPC_HAVE_PMU_SUPPORT
         help
!          This enables the powerpc-specific perf_event back-end.
  
  config SMP
! 	depends on PPC_BOOK3S || PPC_BOOK3E || FSL_BOOKE
  	bool "Symmetric multi-processing support"
  	---help---