michaelh/zephyr
1
0
Fork 0
Code Releases Activity

x86: rename DEBUG_INFO to X86_DEBUG_INFO

Browse source 
This is an X86 specific option and should not appear as generic debug
option.

Fixes zephyrproject-rtos/zephyr#52929

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2025-06-18 13:56:10 -04:00 • committed by Daniel DeGrasse
commit bd8597c9d7
20 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

7
arch/x86/Kconfig
View file

@ -187,6 +187,13 @@ endif # FPU || X86_64
endmenu endmenu
config X86_DEBUG_INFO
bool "System debugging information"
help
This option enables the addition of various information that can be
used by debuggers in debugging the system, or enable additional
debugging information to be reported at runtime.
config SRAM_OFFSET config SRAM_OFFSET
default 0x100000 if X86_PC_COMPATIBLE default 0x100000 if X86_PC_COMPATIBLE
help help

2
arch/x86/core/Kconfig.ia32
View file

@ -166,7 +166,7 @@ endmenu
config ARCH_HAS_STACKWALK config ARCH_HAS_STACKWALK
bool bool
default y default y
select DEBUG_INFO select X86_DEBUG_INFO
select THREAD_STACK_INFO select THREAD_STACK_INFO
depends on !OMIT_FRAME_POINTER depends on !OMIT_FRAME_POINTER
help help

2
arch/x86/core/Kconfig.intel64
View file

@ -32,7 +32,7 @@ config X86_EXCEPTION_STACK_SIZE
config ARCH_HAS_STACKWALK config ARCH_HAS_STACKWALK
bool bool
default y default y
select DEBUG_INFO select X86_DEBUG_INFO
select THREAD_STACK_INFO select THREAD_STACK_INFO
depends on !OMIT_FRAME_POINTER depends on !OMIT_FRAME_POINTER
help help

2
arch/x86/include/ia32/kernel_arch_data.h
View file

@ -40,7 +40,7 @@
/* Some configurations require that the stack/registers be adjusted before /* Some configurations require that the stack/registers be adjusted before
* z_thread_entry. See discussion in swap.S for z_x86_thread_entry_wrapper() * z_thread_entry. See discussion in swap.S for z_x86_thread_entry_wrapper()
*/ */
#if defined(CONFIG_DEBUG_INFO) #if defined(CONFIG_X86_DEBUG_INFO)
#define _THREAD_WRAPPER_REQUIRED #define _THREAD_WRAPPER_REQUIRED
#endif #endif

2
boards/qemu/x86/qemu_x86_64_atom_nokpti_defconfig
View file

@ -8,7 +8,7 @@ CONFIG_SERIAL=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_DEBUG_INFO=y CONFIG_X86_DEBUG_INFO=y
CONFIG_SMP=y CONFIG_SMP=y
CONFIG_MP_MAX_NUM_CPUS=2 CONFIG_MP_MAX_NUM_CPUS=2
CONFIG_X86_MMU=y CONFIG_X86_MMU=y

2
boards/qemu/x86/qemu_x86_64_defconfig
View file

@ -8,7 +8,7 @@ CONFIG_SERIAL=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_DEBUG_INFO=y CONFIG_X86_DEBUG_INFO=y
CONFIG_SMP=y CONFIG_SMP=y
CONFIG_MP_MAX_NUM_CPUS=2 CONFIG_MP_MAX_NUM_CPUS=2
CONFIG_X86_MMU=y CONFIG_X86_MMU=y

2
boards/qemu/x86/qemu_x86_atom_nokpti_defconfig
View file

@ -9,7 +9,7 @@ CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_X86_MMU=y CONFIG_X86_MMU=y
CONFIG_DEBUG_INFO=y CONFIG_X86_DEBUG_INFO=y
CONFIG_SCHED_SCALABLE=y CONFIG_SCHED_SCALABLE=y
CONFIG_WAITQ_SCALABLE=y CONFIG_WAITQ_SCALABLE=y
CONFIG_X86_VERY_EARLY_CONSOLE=y CONFIG_X86_VERY_EARLY_CONSOLE=y

2
boards/qemu/x86/qemu_x86_atom_nommu_defconfig
View file

@ -9,7 +9,7 @@ CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_X86_MMU=n CONFIG_X86_MMU=n
CONFIG_DEBUG_INFO=y CONFIG_X86_DEBUG_INFO=y
CONFIG_SCHED_SIMPLE=y CONFIG_SCHED_SIMPLE=y
CONFIG_WAITQ_SIMPLE=y CONFIG_WAITQ_SIMPLE=y
CONFIG_X86_VERY_EARLY_CONSOLE=n CONFIG_X86_VERY_EARLY_CONSOLE=n

2
boards/qemu/x86/qemu_x86_atom_nopae_defconfig
View file

@ -9,7 +9,7 @@ CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_X86_MMU=y CONFIG_X86_MMU=y
CONFIG_DEBUG_INFO=y CONFIG_X86_DEBUG_INFO=y
CONFIG_SCHED_SCALABLE=y CONFIG_SCHED_SCALABLE=y
CONFIG_WAITQ_SCALABLE=y CONFIG_WAITQ_SCALABLE=y
CONFIG_X86_VERY_EARLY_CONSOLE=y CONFIG_X86_VERY_EARLY_CONSOLE=y

2
boards/qemu/x86/qemu_x86_atom_virt_defconfig
View file

@ -9,7 +9,7 @@ CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_X86_MMU=y CONFIG_X86_MMU=y
CONFIG_DEBUG_INFO=y CONFIG_X86_DEBUG_INFO=y
CONFIG_SCHED_SCALABLE=y CONFIG_SCHED_SCALABLE=y
CONFIG_WAITQ_SCALABLE=y CONFIG_WAITQ_SCALABLE=y
CONFIG_X86_VERY_EARLY_CONSOLE=y CONFIG_X86_VERY_EARLY_CONSOLE=y

2
boards/qemu/x86/qemu_x86_atom_xip_defconfig
View file

@ -9,7 +9,7 @@ CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_X86_MMU=n CONFIG_X86_MMU=n
CONFIG_DEBUG_INFO=y CONFIG_X86_DEBUG_INFO=y
CONFIG_SCHED_SCALABLE=y CONFIG_SCHED_SCALABLE=y
CONFIG_WAITQ_SCALABLE=y CONFIG_WAITQ_SCALABLE=y
CONFIG_X86_VERY_EARLY_CONSOLE=y CONFIG_X86_VERY_EARLY_CONSOLE=y

2
boards/qemu/x86/qemu_x86_defconfig
View file

@ -9,7 +9,7 @@ CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_X86_MMU=y CONFIG_X86_MMU=y
CONFIG_DEBUG_INFO=y CONFIG_X86_DEBUG_INFO=y
CONFIG_SCHED_SCALABLE=y CONFIG_SCHED_SCALABLE=y
CONFIG_WAITQ_SCALABLE=y CONFIG_WAITQ_SCALABLE=y
CONFIG_X86_VERY_EARLY_CONSOLE=y CONFIG_X86_VERY_EARLY_CONSOLE=y

2
boards/qemu/x86/qemu_x86_lakemont_defconfig
View file

@ -9,7 +9,7 @@ CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_X86_MMU=y CONFIG_X86_MMU=y
CONFIG_DEBUG_INFO=y CONFIG_X86_DEBUG_INFO=y
CONFIG_SCHED_SCALABLE=y CONFIG_SCHED_SCALABLE=y
CONFIG_WAITQ_SCALABLE=y CONFIG_WAITQ_SCALABLE=y
CONFIG_X86_VERY_EARLY_CONSOLE=y CONFIG_X86_VERY_EARLY_CONSOLE=y

2
boards/qemu/x86/qemu_x86_tiny_defconfig
View file

@ -9,7 +9,7 @@ CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_X86_MMU=y CONFIG_X86_MMU=y
CONFIG_DEBUG_INFO=y CONFIG_X86_DEBUG_INFO=y
CONFIG_SCHED_SCALABLE=y CONFIG_SCHED_SCALABLE=y
CONFIG_WAITQ_SCALABLE=y CONFIG_WAITQ_SCALABLE=y
CONFIG_X86_VERY_EARLY_CONSOLE=y CONFIG_X86_VERY_EARLY_CONSOLE=y

2
doc/releases/migration-guide-4.2.rst
View file

@ -706,3 +706,5 @@ Architectures
:kconfig:option:`CONFIG_ARCH_HAS_VECTOR_TABLE_RELOCATION` and :kconfig:option:`CONFIG_ARCH_HAS_VECTOR_TABLE_RELOCATION` and
:kconfig:option:`CONFIG_ROMSTART_RELOCATION_ROM` to support relocation :kconfig:option:`CONFIG_ROMSTART_RELOCATION_ROM` to support relocation
of vector table in RAM. of vector table in RAM.
* Renamed :kconfig:option:`CONFIG_DEBUG_INFO` to :kconfig:option:`CONFIG_X86_DEBUG_INFO` to
better reflect its purpose. This option is now only available for x86 architecture.

1
samples/bluetooth/hci_ipc/debug_overlay.conf
View file

@ -1,5 +1,4 @@
CONFIG_LOG=y CONFIG_LOG=y
CONFIG_ASSERT=y CONFIG_ASSERT=y
CONFIG_DEBUG_INFO=y
CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_EXCEPTION_STACK_TRACE=y

1
samples/bluetooth/hci_uart_async/debug.mixin.conf
View file

@ -1,6 +1,5 @@
CONFIG_ASSERT_ON_ERRORS=y CONFIG_ASSERT_ON_ERRORS=y
CONFIG_ASSERT=y CONFIG_ASSERT=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_OPTIMIZATIONS=y CONFIG_DEBUG_OPTIMIZATIONS=y
CONFIG_DEBUG_THREAD_INFO=y CONFIG_DEBUG_THREAD_INFO=y

2
scripts/kconfig/hardened.csv
View file

@ -51,7 +51,7 @@ ZTEST,n
ASSERT,n ASSERT,n
DEBUG,n DEBUG,n
DEBUG_COREDUMP=n DEBUG_COREDUMP=n
DEBUG_INFO,n X86_DEBUG_INFO,n
DEBUG_THREAD_INFO,n DEBUG_THREAD_INFO,n
EARLY_CONSOLE,n EARLY_CONSOLE,n
EXCEPTION_DEBUG,n EXCEPTION_DEBUG,n

Can't render this file because it has a wrong number of fields in line 49.

7
subsys/debug/Kconfig
View file

@ -304,13 +304,6 @@ config OMIT_FRAME_POINTER
# #
# Generic Debugging Options # Generic Debugging Options
# #
config DEBUG_INFO
bool "System debugging information"
help
This option enables the addition of various information that can be
used by debuggers in debugging the system, or enable additional
debugging information to be reported at runtime.
config EXCEPTION_STACK_TRACE config EXCEPTION_STACK_TRACE
bool "Attempt to print stack traces upon exceptions" bool "Attempt to print stack traces upon exceptions"
default y default y

1
tests/bsim/bluetooth/audio/overlay-nrf5340_cpunet_iso-bt_ll_sw_split.conf
View file

@ -17,5 +17,4 @@ CONFIG_BT_CTLR_ISOAL_SOURCES=4
CONFIG_BT_CTLR_ISOAL_SINKS=4 CONFIG_BT_CTLR_ISOAL_SINKS=4
CONFIG_ASSERT=y CONFIG_ASSERT=y
CONFIG_DEBUG_INFO=y
CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_EXCEPTION_STACK_TRACE=y