[parisc-linux-cvs] 7300LC

[Matthew Wilcox]

On Mon, Apr 19, 2004 at 04:32:50PM -0600, Matthew Wilcox wrote:
> 	arch/parisc    : Kconfig Makefile 
> 	include/asm-parisc: processor.h 
> Log message:
> Split out 7300LC from 7100LC and PREFETCH from PA20.

 - Split out the PA7300LC config option from the PA7100LC one.
 - Add CONFIG_PREFETCH and define it if we're using 7300LC or 8000.
 - Rewrite helptext to be more explicit about which machines have
   which CPUs.

Index: arch/parisc/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.6/arch/parisc/Kconfig,v
retrieving revision 1.15
diff -u -p -r1.15 Kconfig
--- a/arch/parisc/Kconfig	20 Mar 2004 20:29:24 -0000	1.15
+++ b/arch/parisc/Kconfig	19 Apr 2004 21:49:08 -0000
@@ -51,25 +51,34 @@ choice
 config PA7000
 	bool "PA7000/PA7100"
 	---help---
-	  This is the processor type of your CPU. This information is used for
-	  optimizing purposes.  In order to compile a kernel that can run on
-	  all PA CPUs (albeit not optimally fast), you can specify "PA7000"
-	  here.
+	  This is the processor type of your CPU.  This information is
+	  used for optimizing purposes.  In order to compile a kernel
+	  that can run on all 32-bit PA CPUs (albeit not optimally fast),
+	  you can specify "PA7000" here.
 
 	  Specifying "PA8000" here will allow you to select a 64-bit kernel
 	  which is required on some machines.
 
 config PA7100LC
-	bool "PA7100LC/PA7300LC"
+	bool "PA7100LC"
 	help
-	  Select this option for a 7100LC or 7300LC processor, as used
-	  in the 712, 715/Mirage, A180, B132, C160L and some other machines.
+	  Select this option for the PCX-L processor, as used in the
+	  712, 715/64, 715/80, 715/100, 715/100XC, 725/100, 743, 748,
+	  D200, D210, D300, D310 and E-class
 
 config PA7200
 	bool "PA7200"
 	help
-	  Select this option for the PCX-T' processor, as used in C110, D100
-	  and similar machines.
+	  Select this option for the PCX-T' processor, as used in the
+	  C100, C110, J100, J110, J210XC, D250, D260, D350, D360,
+	  K100, K200, K210, K220, K400, K410 and K420
+
+config PA7300LC
+	bool "PA7300LC"
+	help
+	  Select this option for the PCX-L2 processor, as used in the
+	  744, A180, B132L, B160L, B180L, C132L, C160L, C180L,
+	  D220, D230, D320 and D330.
 
 config PA8X00
 	bool "PA8000 and up"
@@ -81,14 +90,16 @@ endchoice
 # Define implied options from the CPU selection here
 
 config PA20
-	bool
+	def_bool y
 	depends on PA8X00
-	default y
 
 config PA11
-	bool
-	depends on PA7000 || PA7100LC || PA7200
-	default y
+	def_bool y
+	depends on PA7000 || PA7100LC || PA7200 || PA7300LC
+
+config PREFETCH
+	def_bool y
+	depends on PA7300LC || PA8X00
 
 config PARISC64
 	bool "64-bit kernel"
Index: arch/parisc/Makefile
===================================================================
RCS file: /var/cvs/linux-2.6/arch/parisc/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- a/arch/parisc/Makefile	31 Mar 2004 00:59:37 -0000	1.11
+++ b/arch/parisc/Makefile	19 Apr 2004 21:49:08 -0000
@@ -48,6 +48,7 @@ cflags-y	+= -ffunction-sections
 cflags-$(CONFIG_PA7100)		+= -march=1.1 -mschedule=7100
 cflags-$(CONFIG_PA7200)		+= -march=1.1 -mschedule=7200
 cflags-$(CONFIG_PA7100LC)	+= -march=1.1 -mschedule=7100LC
+cflags-$(CONFIG_PA7300LC)	+= -march=1.1 -mschedule=7300
 cflags-$(CONFIG_PA8X00)		+= -march=2.0 -mschedule=8000
 
 head-y			:= arch/parisc/kernel/head.o 
Index: include/asm-parisc/processor.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-parisc/processor.h,v
retrieving revision 1.5
diff -u -p -r1.5 processor.h
--- a/include/asm-parisc/processor.h	25 Sep 2003 01:07:21 -0000	1.5
+++ b/include/asm-parisc/processor.h	19 Apr 2004 21:49:08 -0000
@@ -317,7 +317,7 @@ static inline unsigned long get_wchan(st
 #define KSTK_EIP(tsk)	((tsk)->thread.regs.iaoq[0])
 #define KSTK_ESP(tsk)	((tsk)->thread.regs.gr[30])
 
-#ifdef  CONFIG_PA20
+#ifdef  CONFIG_PREFETCH
 #define ARCH_HAS_PREFETCH
 extern inline void prefetch(const void *addr)
 {

-- 
"Next the statesmen will invent cheap lies, putting the blame upon 
the nation that is attacked, and every man will be glad of those
conscience-soothing falsities, and will diligently study them, and refuse
to examine any refutations of them; and thus he will by and by convince 
himself that the war is just, and will thank God for the better sleep 
he enjoys after this process of grotesque self-deception." -- Mark Twain