diff --git a/arch/arm64/configs/meson64_defconfig b/arch/arm64/configs/meson64_defconfig
index 5c07f195dc7d..1ad7c657d7ab 100644
--- a/arch/arm64/configs/meson64_defconfig
+++ b/arch/arm64/configs/meson64_defconfig
@@ -216,7 +216,6 @@ CONFIG_AMLOGIC_MEDIA_FB=y
 CONFIG_AMLOGIC_MEDIA_FB_OSD_VSYNC_RDMA=y
 CONFIG_AMLOGIC_MEDIA_FB_OSD2_ENABLE=y
 CONFIG_AMLOGIC_MEDIA_FB_OSD2_CURSOR=y
-CONFIG_AMLOGIC_MEDIA_LOGO=y
 CONFIG_AMLOGIC_MEDIA_DEINTERLACE=y
 CONFIG_AMLOGIC_MEDIA_VIN=y
 CONFIG_AMLOGIC_MEDIA_TVIN=y
@@ -234,7 +233,6 @@ CONFIG_AMLOGIC_NAND=y
 CONFIG_AMLOGIC_VRTC=y
 CONFIG_AMLOGIC_SMARTCARD=y
 CONFIG_AMLOGIC_CEC=y
-CONFIG_AMLOGIC_AO_CEC=y
 CONFIG_AMLOGIC_SECURITY_KEY=y
 CONFIG_AMLOGIC_KEY_MANAGE=y
 CONFIG_AMLOGIC_TEMP_SENSOR=y
@@ -405,8 +403,15 @@ CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_INFO=y
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
+CONFIG_WQ_WATCHDOG=y
+CONFIG_PANIC_ON_RT_THROTTLING=y
 CONFIG_SCHEDSTATS=y
+CONFIG_SCHED_STACK_END_CHECK=y
 CONFIG_TIMER_STATS=y
+CONFIG_DEBUG_ATOMIC_SLEEP=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_STACK_TRACER=y
 CONFIG_FUNCTION_PROFILER=y