diff --git a/kernel/configs/debug.config b/kernel/configs/debug.config
index dc5f7dd084f91..5fdb71069fd3a 100644
--- a/kernel/configs/debug.config
+++ b/kernel/configs/debug.config
@@ -120,36 +120,78 @@ CONFIG_PREEMPT=y
 #
 # Qualcomm Debug Configs
 #
-CONFIG_RELAY=y
 CONFIG_ATH11K_CFR=y
 CONFIG_ATH11K_COREDUMP=y
 CONFIG_ATH11K_DEBUG=y
 CONFIG_ATH11K_DEBUGFS=y
 CONFIG_ATH11K_TRACING=y
+CONFIG_ATH12K_COREDUMP=y
 CONFIG_ATH12K_DEBUG=y
 CONFIG_ATH12K_DEBUGFS=y
 CONFIG_ATH12K_TRACING=y
-CONFIG_ATH12K_COREDUMP=y
 CONFIG_CFG80211_DEBUGFS=y
 CONFIG_CMA_DEBUG=y
+CONFIG_CMA_DEBUGFS=y
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=16000
 CONFIG_DEBUG_LIST=y
 CONFIG_DEBUG_PAGEALLOC=y
+CONFIG_DEBUG_RWSEMS=y
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+CONFIG_DMABUF_SYSFS_STATS=y
+CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
+CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
+CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
 CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_EFI_VARS_PSTORE=y
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
+CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
 CONFIG_FTRACE_SYSCALLS=y
+CONFIG_FUNCTION_ALIGNMENT=8
+CONFIG_FUNCTION_ALIGNMENT_8B=y
 CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_FW_LOADER_DEBUG is not set
+CONFIG_GENERIC_TRACER=y
 CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
+CONFIG_HWLAT_TRACER=y
 CONFIG_IRQSOFF_TRACER=y
 CONFIG_KPROBE_EVENTS=y
+CONFIG_LOCALVERSION=""
+CONFIG_LOCKUP_DETECTOR=y
 CONFIG_MAC80211_DEBUGFS=y
 CONFIG_NL80211_TESTMODE=y
-CONFIG_PREEMPT_TRACER=y
-CONFIG_PREEMPTIRQ_TRACEPOINTS=y
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_PCIEAER_INJECT=y
+CONFIG_PID_IN_CONTEXTIDR=y
 CONFIG_PM_ADVANCED_DEBUG=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_SLEEP_DEBUG=y
+CONFIG_PREEMPT_TRACER=y
+CONFIG_PREEMPTIRQ_TRACEPOINTS=y
+CONFIG_PSTORE=y
+CONFIG_PSTORE_BLK=y
+CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_CONSOLE=y
+CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
+CONFIG_PSTORE_PMSG=y
+CONFIG_RCU_CPU_STALL_CPUTIME=y
+CONFIG_REED_SOLOMON=y
+CONFIG_RELAY=y
 CONFIG_SCHED_TRACER=y
 CONFIG_STACK_TRACER=y
+CONFIG_TEST_DYNAMIC_DEBUG=y
+CONFIG_TIMERLAT_TRACER=y
+CONFIG_TRACE_IRQFLAGS=y
+CONFIG_TRACE_IRQFLAGS_NMI=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACER_SNAPSHOT=y
+CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y
 CONFIG_TRACEPOINTS=y
 CONFIG_TRACING=y
 CONFIG_UPROBE_EVENTS=y
+CONFIG_WQ_CPU_INTENSIVE_REPORT=y
+CONFIG_WQ_WATCHDOG=y