[PATCH] ST40 Subtypes and DEBUG_INFO

Hi,

I'm working through the patches Dave posted up last week to see what I
need to get my ST40 based board running on 2.6. I'm intending to at
least check in the PCI/intc2 code once I'm running but I will be unable
to test on the eval boards so I'm ignoring them for now.

I've just committed this patch which is a simple KConfig update that
deals with the ST40, ST40STB1 and ST40GX config flags that are used in
ST's code tree.

It also adds the CONFIG_DEBUG_INFO which the other arches use to build
vmlinux images with debug symbols.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linuxsh/linux/ChangeLog,v
retrieving revision 1.312
diff -u -b -r1.312 ChangeLog
--- ChangeLog	29 May 2004 00:51:22 -0000	1.312
+++ ChangeLog	2 Jun 2004 12:56:16 -0000
@@ -1,3 +1,8 @@
+2004-06-02  Alex Bennee <[email protected]>
+
+	* arch/sh/KConfig: Added ST subtypes from ST Tree (Dave McKay)
+	* arch/sh/KConfig: Added CONFIG_DEBUG_INFO from other
arch's                          	
+
 2004-05-28  Paul Mundt  <[email protected]>
 
 	* include/asm-sh/pgalloc.h (ptep_test_and_clear_young): Removed.
Index: arch/sh/Kconfig
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/Kconfig,v
retrieving revision 1.49
diff -u -b -r1.49 Kconfig
--- arch/sh/Kconfig	15 May 2004 22:23:48 -0000	1.49
+++ arch/sh/Kconfig	2 Jun 2004 12:56:17 -0000
@@ -236,10 +236,17 @@
 	depends on CPU_SH4
 
 config CPU_SUBTYPE_ST40STB1
-	bool "ST40STB1"
+       bool "ST40STB1 / ST40RA"
 	depends on CPU_SH4
 	help
-	  Select ST40STB1 if you have a ST40STB1 CPU.
+         Select ST40STB1 if you have a ST40RA CPU.
+         This was previously called the ST40STB1, hence the option
name.
+
+config CPU_SUBTYPE_ST40GX1
+       bool "ST40GX1"
+       depends on CPU_SH4
+       help
+         Select ST40GX1 if you have a ST40GX1 CPU.
 
 endchoice
 
@@ -394,6 +401,11 @@
 	depends on SH_HP620 || SH_HP680 || SH_HP690
 	default y
 
+config CPU_SUBTYPE_ST40
+       bool
+       depends on CPU_SUBTYPE_ST40STB1 || CPU_SUBTYPE_ST40GX1
+       default y
+	
 config DISCONTIGMEM
 	bool
 	depends on SH_HP690
@@ -714,6 +726,14 @@
 	  best used in conjunction with the NMI watchdog so that spinlock
 	  deadlocks are also debuggable.
 
+config DEBUG_INFO
+        bool "Compile the kernel with debug info"
+        help
+          If you say Y here the resulting kernel image will include
+          debugging info resulting in a larger kernel image.
+          Say Y here only if you plan to use gdb to debug the kernel.
+          If you don't debug the kernel, you can say N.
+
 config SH_STANDARD_BIOS
 	bool "Use LinuxSH standard BIOS"
 	help

-- 
Alex, Kernel Hacker: http://www.bennee.com/~alex/

Identify bad input; recover if possible.
- The Elements of Programming Style (Kernighan & Plaugher)



-------------------------------------------------------
This SF.Net email is sponsored by the new InstallShield X.
From Windows to Linux, servers to mobile, InstallShield X is the one
installation-authoring solution that does it all. Learn more and
evaluate today! http://www.installshield.com/Dev2Dev/0504