diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-05-19 11:27:00 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-05-19 11:27:00 -0700 |
| commit | ff3b6278edacc846fa63191f9f7ba10171160f61 (patch) | |
| tree | 1a87f5445327e6cb24a0cfb6ce17396dd1e6e828 /arch/arm/mach-omap2/Kconfig | |
| parent | 3e35437046080c7bd7fb4eab67e690978d7d14fd (diff) | |
| parent | fe1435ec4a4fe826212852fdc33d806146ece061 (diff) | |
Merge branch 'v3.18/topic/coresight' into linux-linaro-lsk-v3.18
* v3.18/topic/coresight:
Revert "ARM: removing support for etb/etm in "arch/arm/kernel/""
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 4a63d3311a41..f4d06aea8460 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -292,21 +292,13 @@ config MACH_TI8148EVM depends on SOC_TI81XX default y -config MACH_OMAP_4430SDP - bool "OMAP 4430 SDP board" - default y - depends on ARCH_OMAP4 - select OMAP_PACKAGE_CBL - select OMAP_PACKAGE_CBS - select REGULATOR_FIXED_VOLTAGE if REGULATOR - -config MACH_OMAP4_PANDA - bool "OMAP4 Panda Board" - default y - depends on ARCH_OMAP4 - select OMAP_PACKAGE_CBL - select OMAP_PACKAGE_CBS - select REGULATOR_FIXED_VOLTAGE if REGULATOR +config OMAP3_EMU + bool "OMAP3 debugging peripherals" + depends on ARCH_OMAP3 + select ARM_AMBA + select OC_ETM + help + Say Y here to enable debugging hardware of omap3 config OMAP3_SDRC_AC_TIMING bool "Enable SDRC AC timing register changes" |