From 1147665eb7b42f7a42a66a0320383f621397acd5 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 21 Oct 2013 13:22:32 +0200 Subject: toradex defconfigs: don't set CONFIG_MAGIC_SYSRQ If the boot console is RS232 and RX is left floating this leads to arbitrary sys requests including reboots... (RX is left floating on the evaluation boards if USB to serial is jumpered but USB is not connected) --- arch/arm/configs/apalis_t30_defconfig | 2 +- arch/arm/configs/colibri_t20_android_defconfig | 2 +- arch/arm/configs/colibri_t20_defconfig | 2 +- arch/arm/configs/colibri_t30_android_defconfig | 2 +- arch/arm/configs/colibri_t30_defconfig | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/configs/apalis_t30_defconfig b/arch/arm/configs/apalis_t30_defconfig index 7eaa96620be3..f6db363c83ac 100644 --- a/arch/arm/configs/apalis_t30_defconfig +++ b/arch/arm/configs/apalis_t30_defconfig @@ -387,7 +387,7 @@ CONFIG_NLS_ASCII=m CONFIG_NLS_ISO8859_1=y CONFIG_NLS_UTF8=m CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y +# CONFIG_MAGIC_SYSRQ is not set CONFIG_SCHEDSTATS=y CONFIG_TIMER_STATS=y # CONFIG_DEBUG_PREEMPT is not set diff --git a/arch/arm/configs/colibri_t20_android_defconfig b/arch/arm/configs/colibri_t20_android_defconfig index 6cab2a49631f..4b1553b56034 100644 --- a/arch/arm/configs/colibri_t20_android_defconfig +++ b/arch/arm/configs/colibri_t20_android_defconfig @@ -375,7 +375,7 @@ CONFIG_EFI_PARTITION=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y +# CONFIG_MAGIC_SYSRQ is not set CONFIG_DEBUG_FS=y CONFIG_LOCKUP_DETECTOR=y # CONFIG_DETECT_HUNG_TASK is not set diff --git a/arch/arm/configs/colibri_t20_defconfig b/arch/arm/configs/colibri_t20_defconfig index 0c3518b2579f..26892df10e9c 100644 --- a/arch/arm/configs/colibri_t20_defconfig +++ b/arch/arm/configs/colibri_t20_defconfig @@ -331,7 +331,7 @@ CONFIG_NLS_ASCII=m CONFIG_NLS_ISO8859_1=y CONFIG_NLS_UTF8=m CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y +# CONFIG_MAGIC_SYSRQ is not set CONFIG_SCHEDSTATS=y CONFIG_TIMER_STATS=y # CONFIG_DEBUG_PREEMPT is not set diff --git a/arch/arm/configs/colibri_t30_android_defconfig b/arch/arm/configs/colibri_t30_android_defconfig index 7b58d827e7da..cec9d12b2c3b 100644 --- a/arch/arm/configs/colibri_t30_android_defconfig +++ b/arch/arm/configs/colibri_t30_android_defconfig @@ -415,7 +415,7 @@ CONFIG_EFI_PARTITION=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y +# CONFIG_MAGIC_SYSRQ is not set CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_LOCKUP_DETECTOR=y # CONFIG_DETECT_HUNG_TASK is not set diff --git a/arch/arm/configs/colibri_t30_defconfig b/arch/arm/configs/colibri_t30_defconfig index 6e631d3b94ad..14ed94512715 100644 --- a/arch/arm/configs/colibri_t30_defconfig +++ b/arch/arm/configs/colibri_t30_defconfig @@ -329,7 +329,7 @@ CONFIG_NLS_ASCII=m CONFIG_NLS_ISO8859_1=y CONFIG_NLS_UTF8=m CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y +# CONFIG_MAGIC_SYSRQ is not set CONFIG_SCHEDSTATS=y CONFIG_TIMER_STATS=y # CONFIG_DEBUG_PREEMPT is not set -- cgit v1.2.3