bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

debug: fix RTT console Kconfig

Browse Source 
Use HAS_ Kconfig option as intended, those are invisible option that
signify support of a certain feature that can be selected by a hardware
or platform.

For RTT and system view this was not dont in an inconsistent way.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2018-03-03 16:11:24 -06:00 committed by Anas Nashif
parent 8470b4d365
commit e5f1b51f01
8 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/soc/nordic_nrf5/nrf52/Kconfig.soc
View File

@ -20,10 +20,12 @@ depends on SOC_SERIES_NRF52X
config SOC_NRF52832_QFAA
bool "NRF52832_QFAA"
select SOC_NRF52832
select HAS_SEGGER_RTT
config SOC_NRF52840_QIAA
bool "NRF52840_QIAA"
select SOC_NRF52840
select HAS_SEGGER_RTT
endchoice

2
ext/debug/CMakeLists.txt
View File

@ -1 +1 @@
add_subdirectory_ifdef(CONFIG_HAS_SEGGER_RTT segger)
add_subdirectory_ifdef(CONFIG_RTT_CONSOLE segger)

4
ext/debug/segger/CMakeLists.txt
View File

@ -1,4 +1,4 @@
zephyr_include_directories(.)
zephyr_sources_ifdef(CONFIG_HAS_SEGGER_RTT rtt/SEGGER_RTT.c)
zephyr_sources_ifdef(CONFIG_HAS_SEGGER_SYSTEMVIEW systemview/SEGGER_SYSVIEW.c)
zephyr_sources_ifdef(CONFIG_RTT_CONSOLE rtt/SEGGER_RTT.c)
zephyr_sources_ifdef(CONFIG_SEGGER_SYSTEMVIEW systemview/SEGGER_SYSVIEW.c)

6
ext/debug/segger/Kconfig
View File

@ -6,11 +6,11 @@
config HAS_SEGGER_RTT
bool
prompt "Segger RTT support"
default n
config HAS_SEGGER_SYSTEMVIEW
config SEGGER_SYSTEMVIEW
bool
prompt "Segger SystemView support"
default n
select HAS_SEGGER_RTT
depends on HAS_SEGGER_RTT
select RTT_CONSOLE

6
samples/net/echo_client/prj_frdm_kw41z.conf
View File

@ -1,10 +1,4 @@
CONFIG_UART_CONSOLE=y
CONFIG_RTT_CONSOLE=n
CONFIG_HAS_SEGGER_RTT=n
#CONFIG_OPENOCD_SUPPORT=y
CONFIG_BOOT_BANNER=y
CONFIG_STACK_SENTINEL=y
CONFIG_THREAD_MONITOR=y
CONFIG_OBJECT_TRACING=y

7
samples/net/echo_server/prj_frdm_kw41z.conf
View File

@ -1,16 +1,9 @@
CONFIG_UART_CONSOLE=y
CONFIG_RTT_CONSOLE=n
CONFIG_HAS_SEGGER_RTT=n
CONFIG_BOOT_BANNER=y
CONFIG_STACK_SENTINEL=y
CONFIG_THREAD_MONITOR=y
CONFIG_OBJECT_TRACING=y
CONFIG_KERNEL_SHELL=y
CONFIG_NETWORKING=y
CONFIG_NET_BUF_RX_COUNT=80
CONFIG_NET_BUF_TX_COUNT=40

4
samples/subsys/debug/sysview/prj.conf
View File

@ -5,8 +5,8 @@ CONFIG_KERNEL_EVENT_LOGGER_CONTEXT_SWITCH=y
CONFIG_KERNEL_EVENT_LOGGER_INTERRUPT=y
CONFIG_KERNEL_EVENT_LOGGER_SLEEP=y
CONFIG_KERNEL_EVENT_LOGGER_THREAD=y
CONFIG_HAS_SEGGER_RTT=y
CONFIG_HAS_SEGGER_SYSTEMVIEW=y
CONFIG_SEGGER_SYSTEMVIEW=y
CONFIG_SEGGER_RTT=y
CONFIG_THREAD_MONITOR=y
CONFIG_SYS_LOG=y
CONFIG_SYS_LOG_DEFAULT_LEVEL=3

4
samples/subsys/debug/sysview/sample.yaml
View File

@ -2,5 +2,5 @@ sample:
name: Systemview Demo
tests:
test:
platform_whitelist: frdm_k64f
tags: apps debug
filter: CONFIG_HAS_SEGGER_RTT
tags: debug tracing