summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig.debug
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-15 00:27:27 +0200
committerArnd Bergmann <arnd@arndb.de>2016-09-15 00:27:27 +0200
commitf6b2dae76e0e138f8b4b6c375f10d2f8272982be (patch)
tree8c05f9c7add039c47225a0f3a4dab5a02598977a /arch/arm/Kconfig.debug
parentMerge tag 'arm-soc/for-4.9/soc' of http://github.com/Broadcom/stblinux into n... (diff)
parentARM: shmobile: r8a7791: only use smp_init when SMP is selected (diff)
downloadlinux-f6b2dae76e0e138f8b4b6c375f10d2f8272982be.tar.xz
linux-f6b2dae76e0e138f8b4b6c375f10d2f8272982be.zip
Merge tag 'renesas-soc-for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Pull "Renesas ARM Based SoC Updates for v4.9" from Simon Horman: Clean-up: * Only use smp_init when SMP is selected Enablement: * Add debug-ll support for r8a7992 * tag 'renesas-soc-for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7791: only use smp_init when SMP is selected ARM: shmobile: r8a7790: only use smp_init when SMP is selected ARM: debug-ll: Add support for r8a7992
Diffstat (limited to 'arch/arm/Kconfig.debug')
-rw-r--r--arch/arm/Kconfig.debug8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index a660508a58bd..d83f7c369e51 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -862,12 +862,12 @@ choice
via SCIF2 on Renesas R-Car H1 (R8A7779).
config DEBUG_RCAR_GEN2_SCIF0
- bool "Kernel low-level debugging messages via SCIF0 on R8A7790/R8A7791/R8A7793"
- depends on ARCH_R8A7790 || ARCH_R8A7791 || ARCH_R8A7793
+ bool "Kernel low-level debugging messages via SCIF0 on R8A7790/R8A7791/R8A7792/R8A7793"
+ depends on ARCH_R8A7790 || ARCH_R8A7791 || ARCH_R8A7792 || ARCH_R8A7793
help
Say Y here if you want kernel low-level debugging support
- via SCIF0 on Renesas R-Car H2 (R8A7790), M2-W (R8A7791), or
- M2-N (R8A7793).
+ via SCIF0 on Renesas R-Car H2 (R8A7790), M2-W (R8A7791), V2H
+ (R8A7792), or M2-N (R8A7793).
config DEBUG_RCAR_GEN2_SCIF2
bool "Kernel low-level debugging messages via SCIF2 on R8A7794"