diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a9a883a3104..27fa6e40dcc 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -187,6 +187,13 @@ endif # FPU || X86_64 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 default 0x100000 if X86_PC_COMPATIBLE help diff --git a/arch/x86/core/Kconfig.ia32 b/arch/x86/core/Kconfig.ia32 index 75a3c2bbb7c..f24e7d37758 100644 --- a/arch/x86/core/Kconfig.ia32 +++ b/arch/x86/core/Kconfig.ia32 @@ -166,7 +166,7 @@ endmenu config ARCH_HAS_STACKWALK bool default y - select DEBUG_INFO + select X86_DEBUG_INFO select THREAD_STACK_INFO depends on !OMIT_FRAME_POINTER help diff --git a/arch/x86/core/Kconfig.intel64 b/arch/x86/core/Kconfig.intel64 index e1f5869c772..0f73341db31 100644 --- a/arch/x86/core/Kconfig.intel64 +++ b/arch/x86/core/Kconfig.intel64 @@ -32,7 +32,7 @@ config X86_EXCEPTION_STACK_SIZE config ARCH_HAS_STACKWALK bool default y - select DEBUG_INFO + select X86_DEBUG_INFO select THREAD_STACK_INFO depends on !OMIT_FRAME_POINTER help diff --git a/arch/x86/include/ia32/kernel_arch_data.h b/arch/x86/include/ia32/kernel_arch_data.h index 3f8c2732f9e..f1c2943295c 100644 --- a/arch/x86/include/ia32/kernel_arch_data.h +++ b/arch/x86/include/ia32/kernel_arch_data.h @@ -40,7 +40,7 @@ /* Some configurations require that the stack/registers be adjusted before * 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 #endif diff --git a/boards/qemu/x86/qemu_x86_64_atom_nokpti_defconfig b/boards/qemu/x86/qemu_x86_64_atom_nokpti_defconfig index 6b67200e544..8c10c786e83 100644 --- a/boards/qemu/x86/qemu_x86_64_atom_nokpti_defconfig +++ b/boards/qemu/x86/qemu_x86_64_atom_nokpti_defconfig @@ -8,7 +8,7 @@ CONFIG_SERIAL=y CONFIG_UART_CONSOLE=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_DEBUG_INFO=y +CONFIG_X86_DEBUG_INFO=y CONFIG_SMP=y CONFIG_MP_MAX_NUM_CPUS=2 CONFIG_X86_MMU=y diff --git a/boards/qemu/x86/qemu_x86_64_defconfig b/boards/qemu/x86/qemu_x86_64_defconfig index 9ca58bfcb70..1ffccaa4903 100644 --- a/boards/qemu/x86/qemu_x86_64_defconfig +++ b/boards/qemu/x86/qemu_x86_64_defconfig @@ -8,7 +8,7 @@ CONFIG_SERIAL=y CONFIG_UART_CONSOLE=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_DEBUG_INFO=y +CONFIG_X86_DEBUG_INFO=y CONFIG_SMP=y CONFIG_MP_MAX_NUM_CPUS=2 CONFIG_X86_MMU=y diff --git a/boards/qemu/x86/qemu_x86_atom_nokpti_defconfig b/boards/qemu/x86/qemu_x86_atom_nokpti_defconfig index 33cbf5de6b4..a2c8d1557f4 100644 --- a/boards/qemu/x86/qemu_x86_atom_nokpti_defconfig +++ b/boards/qemu/x86/qemu_x86_atom_nokpti_defconfig @@ -9,7 +9,7 @@ CONFIG_UART_CONSOLE=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_X86_MMU=y -CONFIG_DEBUG_INFO=y +CONFIG_X86_DEBUG_INFO=y CONFIG_SCHED_SCALABLE=y CONFIG_WAITQ_SCALABLE=y CONFIG_X86_VERY_EARLY_CONSOLE=y diff --git a/boards/qemu/x86/qemu_x86_atom_nommu_defconfig b/boards/qemu/x86/qemu_x86_atom_nommu_defconfig index 3215747a004..11ab9b67f70 100644 --- a/boards/qemu/x86/qemu_x86_atom_nommu_defconfig +++ b/boards/qemu/x86/qemu_x86_atom_nommu_defconfig @@ -9,7 +9,7 @@ CONFIG_UART_CONSOLE=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_X86_MMU=n -CONFIG_DEBUG_INFO=y +CONFIG_X86_DEBUG_INFO=y CONFIG_SCHED_SIMPLE=y CONFIG_WAITQ_SIMPLE=y CONFIG_X86_VERY_EARLY_CONSOLE=n diff --git a/boards/qemu/x86/qemu_x86_atom_nopae_defconfig b/boards/qemu/x86/qemu_x86_atom_nopae_defconfig index bccb2e2771e..f9b6a84df16 100644 --- a/boards/qemu/x86/qemu_x86_atom_nopae_defconfig +++ b/boards/qemu/x86/qemu_x86_atom_nopae_defconfig @@ -9,7 +9,7 @@ CONFIG_UART_CONSOLE=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_X86_MMU=y -CONFIG_DEBUG_INFO=y +CONFIG_X86_DEBUG_INFO=y CONFIG_SCHED_SCALABLE=y CONFIG_WAITQ_SCALABLE=y CONFIG_X86_VERY_EARLY_CONSOLE=y diff --git a/boards/qemu/x86/qemu_x86_atom_virt_defconfig b/boards/qemu/x86/qemu_x86_atom_virt_defconfig index f4a79e4d306..16f4f9f30f7 100644 --- a/boards/qemu/x86/qemu_x86_atom_virt_defconfig +++ b/boards/qemu/x86/qemu_x86_atom_virt_defconfig @@ -9,7 +9,7 @@ CONFIG_UART_CONSOLE=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_X86_MMU=y -CONFIG_DEBUG_INFO=y +CONFIG_X86_DEBUG_INFO=y CONFIG_SCHED_SCALABLE=y CONFIG_WAITQ_SCALABLE=y CONFIG_X86_VERY_EARLY_CONSOLE=y diff --git a/boards/qemu/x86/qemu_x86_atom_xip_defconfig b/boards/qemu/x86/qemu_x86_atom_xip_defconfig index 230d6ea36d2..aa6784d44ac 100644 --- a/boards/qemu/x86/qemu_x86_atom_xip_defconfig +++ b/boards/qemu/x86/qemu_x86_atom_xip_defconfig @@ -9,7 +9,7 @@ CONFIG_UART_CONSOLE=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_X86_MMU=n -CONFIG_DEBUG_INFO=y +CONFIG_X86_DEBUG_INFO=y CONFIG_SCHED_SCALABLE=y CONFIG_WAITQ_SCALABLE=y CONFIG_X86_VERY_EARLY_CONSOLE=y diff --git a/boards/qemu/x86/qemu_x86_defconfig b/boards/qemu/x86/qemu_x86_defconfig index 754f0a47c83..a1860500edf 100644 --- a/boards/qemu/x86/qemu_x86_defconfig +++ b/boards/qemu/x86/qemu_x86_defconfig @@ -9,7 +9,7 @@ CONFIG_UART_CONSOLE=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_X86_MMU=y -CONFIG_DEBUG_INFO=y +CONFIG_X86_DEBUG_INFO=y CONFIG_SCHED_SCALABLE=y CONFIG_WAITQ_SCALABLE=y CONFIG_X86_VERY_EARLY_CONSOLE=y diff --git a/boards/qemu/x86/qemu_x86_lakemont_defconfig b/boards/qemu/x86/qemu_x86_lakemont_defconfig index 754f0a47c83..a1860500edf 100644 --- a/boards/qemu/x86/qemu_x86_lakemont_defconfig +++ b/boards/qemu/x86/qemu_x86_lakemont_defconfig @@ -9,7 +9,7 @@ CONFIG_UART_CONSOLE=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_X86_MMU=y -CONFIG_DEBUG_INFO=y +CONFIG_X86_DEBUG_INFO=y CONFIG_SCHED_SCALABLE=y CONFIG_WAITQ_SCALABLE=y CONFIG_X86_VERY_EARLY_CONSOLE=y diff --git a/boards/qemu/x86/qemu_x86_tiny_defconfig b/boards/qemu/x86/qemu_x86_tiny_defconfig index 349e1b6ec71..6b3ac0756c9 100644 --- a/boards/qemu/x86/qemu_x86_tiny_defconfig +++ b/boards/qemu/x86/qemu_x86_tiny_defconfig @@ -9,7 +9,7 @@ CONFIG_UART_CONSOLE=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_X86_MMU=y -CONFIG_DEBUG_INFO=y +CONFIG_X86_DEBUG_INFO=y CONFIG_SCHED_SCALABLE=y CONFIG_WAITQ_SCALABLE=y CONFIG_X86_VERY_EARLY_CONSOLE=y diff --git a/doc/releases/migration-guide-4.2.rst b/doc/releases/migration-guide-4.2.rst index a709ecd2c25..3a34ecb43e2 100644 --- a/doc/releases/migration-guide-4.2.rst +++ b/doc/releases/migration-guide-4.2.rst @@ -706,3 +706,5 @@ Architectures :kconfig:option:`CONFIG_ARCH_HAS_VECTOR_TABLE_RELOCATION` and :kconfig:option:`CONFIG_ROMSTART_RELOCATION_ROM` to support relocation 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. diff --git a/samples/bluetooth/hci_ipc/debug_overlay.conf b/samples/bluetooth/hci_ipc/debug_overlay.conf index 774a2a1c45b..9663018546c 100644 --- a/samples/bluetooth/hci_ipc/debug_overlay.conf +++ b/samples/bluetooth/hci_ipc/debug_overlay.conf @@ -1,5 +1,4 @@ CONFIG_LOG=y CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y diff --git a/samples/bluetooth/hci_uart_async/debug.mixin.conf b/samples/bluetooth/hci_uart_async/debug.mixin.conf index 2fab13907a6..47bed685741 100644 --- a/samples/bluetooth/hci_uart_async/debug.mixin.conf +++ b/samples/bluetooth/hci_uart_async/debug.mixin.conf @@ -1,6 +1,5 @@ CONFIG_ASSERT_ON_ERRORS=y CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_DEBUG_OPTIMIZATIONS=y CONFIG_DEBUG_THREAD_INFO=y diff --git a/scripts/kconfig/hardened.csv b/scripts/kconfig/hardened.csv index 4a126b96fc1..2847e040b11 100644 --- a/scripts/kconfig/hardened.csv +++ b/scripts/kconfig/hardened.csv @@ -51,7 +51,7 @@ ZTEST,n ASSERT,n DEBUG,n DEBUG_COREDUMP=n -DEBUG_INFO,n +X86_DEBUG_INFO,n DEBUG_THREAD_INFO,n EARLY_CONSOLE,n EXCEPTION_DEBUG,n diff --git a/subsys/debug/Kconfig b/subsys/debug/Kconfig index e80570f12f8..6f56028e7bc 100644 --- a/subsys/debug/Kconfig +++ b/subsys/debug/Kconfig @@ -304,13 +304,6 @@ config OMIT_FRAME_POINTER # # 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 bool "Attempt to print stack traces upon exceptions" default y diff --git a/tests/bsim/bluetooth/audio/overlay-nrf5340_cpunet_iso-bt_ll_sw_split.conf b/tests/bsim/bluetooth/audio/overlay-nrf5340_cpunet_iso-bt_ll_sw_split.conf index 869d43f5fbc..01d7cbc158d 100644 --- a/tests/bsim/bluetooth/audio/overlay-nrf5340_cpunet_iso-bt_ll_sw_split.conf +++ b/tests/bsim/bluetooth/audio/overlay-nrf5340_cpunet_iso-bt_ll_sw_split.conf @@ -17,5 +17,4 @@ CONFIG_BT_CTLR_ISOAL_SOURCES=4 CONFIG_BT_CTLR_ISOAL_SINKS=4 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y