aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-05-19 14:27:19 -0700
committerKevin Hilman <khilman@linaro.org>2015-05-19 14:27:22 -0700
commit867f900b43f8d571962b4a47035a0af9ebf84461 (patch)
tree8dd7f7fabee1769f00996527123c13cebdf28e36
parentfe1435ec4a4fe826212852fdc33d806146ece061 (diff)
downloadlinux-linaro-stable-v3.18/topic/coresight.tar.gz
ARM: Kconfig.debug: OC_ETM and CORESIGHT are mutually exclusivev3.18/topic/coresight
The android tree still has the legacy ETM driver, but it cannot coexist with the new Coresight driver, so make sure they are mutually exclusive at compile time. Signed-off-by: Kevin Hilman <khilman@linaro.org>
-rw-r--r--arch/arm/Kconfig.debug2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 96651f74d6f6..21c031fe76d8 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -1299,7 +1299,7 @@ config EARLY_PRINTK
config OC_ETM
bool "On-chip ETM and ETB"
- depends on ARM_AMBA
+ depends on ARM_AMBA && !CORESIGHT
help
Enables the on-chip embedded trace macrocell and embedded trace
buffer driver that will allow you to collect traces of the