diff --git a/arch/arm/configs/rv1126b-evb.config b/arch/arm/configs/rv1126b-evb.config
index d06a3820a466..b47e29dc2647 100644
--- a/arch/arm/configs/rv1126b-evb.config
+++ b/arch/arm/configs/rv1126b-evb.config
@@ -7,6 +7,7 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y
 CONFIG_FILE_LOCKING=y
+CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_I2C_GPIO=y
 CONFIG_I2C_MUX=y
 CONFIG_INPUT=y
@@ -22,6 +23,8 @@ CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NVMEM_SYSFS=y
+CONFIG_PANIC_ON_OOPS=y
+CONFIG_PANIC_ON_OOPS_VALUE=1
 CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y
 CONFIG_RK_CMA_PROCFS=y
 CONFIG_RK_DMABUF_PROCFS=y
@@ -34,6 +37,7 @@ CONFIG_SND_SOC_RK817=y
 CONFIG_SND_SOC_RK_DSM=y
 CONFIG_SND_SOC_ROCKCHIP_ASRC=y
 CONFIG_SND_SOC_ROCKCHIP_PDM_V2=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
 CONFIG_SPI=y
 CONFIG_USB_SUPPORT=y
 CONFIG_VFAT_FS=y
@@ -137,6 +141,8 @@ CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BMC150_MAGN_SPI is not set
 # CONFIG_BMI088_ACCEL is not set
 # CONFIG_BMI160_SPI is not set
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
 # CONFIG_BSD_DISKLABEL is not set
 # CONFIG_CEPH_FS is not set
 CONFIG_CFG80211=m
@@ -312,6 +318,7 @@ CONFIG_FS_POSIX_ACL=y
 # CONFIG_GPIO_XRA1403 is not set
 CONFIG_GRACE_PERIOD=y
 # CONFIG_GUP_TEST is not set
+CONFIG_HARDLOCKUP_DETECTOR_OTHER_CPU=y
 # CONFIG_HI8435 is not set
 # CONFIG_HID is not set
 # CONFIG_HID_PID is not set
@@ -421,6 +428,7 @@ CONFIG_KEYBOARD_ADC=y
 # CONFIG_LMK04832 is not set
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
+CONFIG_LOCKUP_DETECTOR=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 # CONFIG_LTC1660 is not set
 # CONFIG_LTC2496 is not set
diff --git a/arch/arm/configs/rv1126b_defconfig b/arch/arm/configs/rv1126b_defconfig
index 80d882c9d4c9..18e7a3d5b3c8 100644
--- a/arch/arm/configs/rv1126b_defconfig
+++ b/arch/arm/configs/rv1126b_defconfig
@@ -213,11 +213,6 @@ CONFIG_PRINTK_TIME_FROM_ARM_ARCH_TIMER=y
 # CONFIG_DEBUG_MISC is not set
 CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_SLUB_DEBUG is not set
-CONFIG_PANIC_ON_OOPS=y
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
-# CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_RCU_TRACE is not set
 # CONFIG_FTRACE is not set