diff --git a/arch/arm64/configs/bullhead_defconfig b/arch/arm64/configs/bullhead_defconfig
index 78ecf3257886c6e22d7f72530dbe82928b880dc0..d5c010db7b55092b42b8ea3ef09597742fffaba7 100644
--- a/arch/arm64/configs/bullhead_defconfig
+++ b/arch/arm64/configs/bullhead_defconfig
@@ -305,8 +305,6 @@ CONFIG_INPUT_FPC1020=y
 # CONFIG_SERIO_I8042 is not set
 # CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVMEM is not set
-# CONFIG_DEVKMEM is not set
 CONFIG_SERIAL_MSM_HS=y
 CONFIG_SERIAL_MSM_HSL=y
 CONFIG_SERIAL_MSM_HSL_CONSOLE=y
@@ -586,8 +584,6 @@ CONFIG_MSM_MEMORY_DUMP_V2=y
 CONFIG_MSM_DEBUG_LAR_UNLOCK=y
 CONFIG_MSM_DDR_HEALTH=y
 CONFIG_MSM_COMMON_LOG=y
-CONFIG_MSM_WATCHDOG_V2=y
-CONFIG_MSM_FORCE_WDOG_BITE_ON_PANIC=y
 CONFIG_MSM_HVC=y
 CONFIG_MSM_SUBSYSTEM_RESTART=y
 CONFIG_MSM_SYSMON_COMM=y
@@ -626,7 +622,6 @@ CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
 CONFIG_PRINTK_TIME=y
-CONFIG_MAGIC_SYSRQ=y
 # CONFIG_SYSRQ_SCHED_DEBUG is not set
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
@@ -640,6 +635,8 @@ CONFIG_OOPS_LOG_BUFFER=y
 CONFIG_LOG_BUF_MAGIC=y
 CONFIG_OOPS_LOG_BUF_SHIFT=17
 CONFIG_PANIC_ON_DATA_CORRUPTION=y
+CONFIG_KGDB=y
+CONFIG_KGDB_KDB=y
 CONFIG_ARM64_PTDUMP=y
 # CONFIG_EARLY_PRINTK is not set
 CONFIG_PID_IN_CONTEXTIDR=y