diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
| commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
| tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /arch/sh/Kconfig.debug | |
| parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
| parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'arch/sh/Kconfig.debug')
| -rw-r--r-- | arch/sh/Kconfig.debug | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug index 0f4549860226..4d2d102e00d5 100644 --- a/arch/sh/Kconfig.debug +++ b/arch/sh/Kconfig.debug | |||
| @@ -36,7 +36,8 @@ config EARLY_SCIF_CONSOLE_PORT | |||
| 36 | default "0xff804000" if CPU_SUBTYPE_MXG | 36 | default "0xff804000" if CPU_SUBTYPE_MXG |
| 37 | default "0xffc30000" if CPU_SUBTYPE_SHX3 | 37 | default "0xffc30000" if CPU_SUBTYPE_SHX3 |
| 38 | default "0xffe00000" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7763 || \ | 38 | default "0xffe00000" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7763 || \ |
| 39 | CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7366 | 39 | CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7366 || \ |
| 40 | CPU_SUBTYPE_SH7343 | ||
| 40 | default "0xffe80000" if CPU_SH4 | 41 | default "0xffe80000" if CPU_SH4 |
| 41 | default "0xffea0000" if CPU_SUBTYPE_SH7785 | 42 | default "0xffea0000" if CPU_SUBTYPE_SH7785 |
| 42 | default "0xfffe8000" if CPU_SUBTYPE_SH7203 | 43 | default "0xfffe8000" if CPU_SUBTYPE_SH7203 |
| @@ -181,7 +182,7 @@ if SUPERH64 | |||
| 181 | 182 | ||
| 182 | config SH64_PROC_ASIDS | 183 | config SH64_PROC_ASIDS |
| 183 | bool "Debug: report ASIDs through /proc/asids" | 184 | bool "Debug: report ASIDs through /proc/asids" |
| 184 | depends on PROC_FS | 185 | depends on PROC_FS && MMU |
| 185 | 186 | ||
| 186 | config SH64_SR_WATCH | 187 | config SH64_SR_WATCH |
| 187 | bool "Debug: set SR.WATCH to enable hardware watchpoints and trace" | 188 | bool "Debug: set SR.WATCH to enable hardware watchpoints and trace" |