michaelh/zephyr
1
0
Fork 0
Code Releases Activity

debug: Remove deprecated CONFIG_OPENOCD_SUPPORT

Browse source 
CONFIG_OPENOCD_SUPPORT was deprecated in favor of
CONFIG_DEBUG_THREAD_INFO in Zephyr v2.6.0 and can now be removed.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
This commit is contained in:
Maureen Helm 2022-01-22 15:29:03 -06:00 • committed by Anas Nashif
commit 1a7bc06086
5 changed files with 5 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
doc/releases/release-notes-3.0.rst
View file

@ -75,6 +75,9 @@ Removed APIs in this release:
is changed so that it more closely mimics the real UART controller, is changed so that it more closely mimics the real UART controller,
option is no longer necessary. option is no longer necessary.
* Removed Kconfig option ``CONFIG_OPENOCD_SUPPORT`` in favor of
``CONFIG_DEBUG_THREAD_INFO``.
Deprecated in this release: Deprecated in this release:
* :c:macro:`USBD_CFG_DATA_DEFINE` is deprecated in favor of utilizing * :c:macro:`USBD_CFG_DATA_DEFINE` is deprecated in favor of utilizing

6
scripts/west_commands/runners/core.py
View file

@ -552,11 +552,9 @@ class ZephyrBinaryRunner(abc.ABC):
@property @property
def thread_info_enabled(self) -> bool: def thread_info_enabled(self) -> bool:
'''Returns True if self.build_conf has '''Returns True if self.build_conf has
CONFIG_DEBUG_THREAD_INFO enabled. This supports the CONFIG_DEBUG_THREAD_INFO enabled.
CONFIG_OPENOCD_SUPPORT fallback as well for now.
''' '''
return (self.build_conf.getboolean('CONFIG_DEBUG_THREAD_INFO') or return self.build_conf.getboolean('CONFIG_DEBUG_THREAD_INFO')
self.build_conf.getboolean('CONFIG_OPENOCD_SUPPORT'))
@classmethod @classmethod
def dev_id_help(cls) -> str: def dev_id_help(cls) -> str:

6
subsys/debug/CMakeLists.txt
View file

@ -1,11 +1,5 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
if(CONFIG_OPENOCD_SUPPORT)
message(WARNING "CONFIG_OPENOCD_SUPPORT is deprecated
Please use DEBUG_THREAD_INFO instead."
)
endif()
zephyr_sources_ifdef( zephyr_sources_ifdef(
CONFIG_DEBUG_THREAD_INFO CONFIG_DEBUG_THREAD_INFO
thread_info.c thread_info.c

6
subsys/debug/Kconfig
View file

@ -322,12 +322,6 @@ config EXCEPTION_STACK_TRACE
# #
# Miscellaneous debugging options # Miscellaneous debugging options
# #
config OPENOCD_SUPPORT
bool "OpenOCD support (DEPRECATED)"
select DEBUG_THREAD_INFO
help
This is deprecated, please use DEBUG_THREAD_INFO instead.
config DEBUG_THREAD_INFO config DEBUG_THREAD_INFO
bool "Thread awareness support" bool "Thread awareness support"
depends on !SMP depends on !SMP

6
subsys/debug/thread_info.c
View file

@ -122,15 +122,9 @@ size_t _kernel_thread_info_offsets[] = {
* checked with _kernel_thread_info_num_offsets. * checked with _kernel_thread_info_num_offsets.
*/ */
}; };
extern size_t __attribute__((alias("_kernel_thread_info_offsets")))
_kernel_openocd_offsets;
__attribute__((used, section(".dbg_thread_info"))) __attribute__((used, section(".dbg_thread_info")))
size_t _kernel_thread_info_num_offsets = ARRAY_SIZE(_kernel_thread_info_offsets); size_t _kernel_thread_info_num_offsets = ARRAY_SIZE(_kernel_thread_info_offsets);
extern size_t __attribute__((alias("_kernel_thread_info_num_offsets")))
_kernel_openocd_num_offsets;
__attribute__((used, section(".dbg_thread_info"))) __attribute__((used, section(".dbg_thread_info")))
uint8_t _kernel_thread_info_size_t_size = (uint8_t)sizeof(size_t); uint8_t _kernel_thread_info_size_t_size = (uint8_t)sizeof(size_t);
extern uint8_t __attribute__((alias("_kernel_thread_info_size_t_size")))
_kernel_openocd_size_t_size;