From: Huang, Tao <huangtao@rock-chips.com>
Date: Wed, 1 Apr 2015 03:24:16 +0000 (+0800)
Subject: arm64: rockchip: rockchip_defconfig disable reboot while panic
X-Git-Tag: firefly_0821_release~4158^2~246
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=de2da66e82327b27ef6a09a280e80c3e9d903c71;p=firefly-linux-kernel-4.4.55.git

arm64: rockchip: rockchip_defconfig disable reboot while panic

just for debug

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
---

diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig
index 169fd528c3b5..47939db1e237 100644
--- a/arch/arm64/configs/rockchip_defconfig
+++ b/arch/arm64/configs/rockchip_defconfig
@@ -19,7 +19,6 @@ CONFIG_NAMESPACES=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_PANIC_TIMEOUT=1
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
@@ -600,8 +599,6 @@ CONFIG_PRINTK_TIME=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_LOCKUP_DETECTOR=y
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=10
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y