Skip to content

Commit 5a2d95f

Browse files
committed
Sync Linux options to be closer to other Nerves systems
This enables pstore even though it's not used now. It also updates the kernel panic timer so that the device reboots 10 seconds after a panic. No manual intervention needed.
1 parent 5640d51 commit 5a2d95f

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

linux/linux-6.1.defconfig

+7-2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ CONFIG_NETDEVICES=y
4949
# CONFIG_NET_CORE is not set
5050
# CONFIG_ETHERNET is not set
5151
# CONFIG_USB_NET_DRIVERS is not set
52+
# CONFIG_INPUT_LEDS is not set
5253
CONFIG_INPUT_EVDEV=y
5354
# CONFIG_KEYBOARD_ATKBD is not set
5455
CONFIG_KEYBOARD_GPIO=y
@@ -287,7 +288,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
287288
CONFIG_LEDS_TRIGGER_CPU=y
288289
CONFIG_LEDS_TRIGGER_ACTIVITY=y
289290
CONFIG_LEDS_TRIGGER_PANIC=y
290-
CONFIG_LEDS_TRIGGER_NETDEV=y
291291
CONFIG_LEDS_TRIGGER_PATTERN=y
292292
CONFIG_RTC_CLASS=y
293293
CONFIG_RTC_DRV_SUN6I=y
@@ -315,10 +315,13 @@ CONFIG_F2FS_FS=y
315315
# CONFIG_F2FS_FS_XATTR is not set
316316
# CONFIG_DNOTIFY is not set
317317
CONFIG_TMPFS=y
318-
CONFIG_TMPFS_POSIX_ACL=y
319318
CONFIG_SQUASHFS=y
320319
CONFIG_SQUASHFS_FILE_DIRECT=y
321320
CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
321+
CONFIG_PSTORE=y
322+
CONFIG_PSTORE_CONSOLE=y
323+
CONFIG_PSTORE_PMSG=y
324+
CONFIG_PSTORE_RAM=y
322325
# CONFIG_NETWORK_FILESYSTEMS is not set
323326
CONFIG_NLS_DEFAULT="utf8"
324327
CONFIG_NLS_CODEPAGE_437=y
@@ -341,7 +344,9 @@ CONFIG_PRINTK_TIME=y
341344
# CONFIG_FRAME_POINTER is not set
342345
CONFIG_DEBUG_FS=y
343346
# CONFIG_SLUB_DEBUG is not set
347+
CONFIG_PANIC_TIMEOUT=10
344348
# CONFIG_SCHED_DEBUG is not set
349+
# CONFIG_DEBUG_PREEMPT is not set
345350
CONFIG_DEBUG_ATOMIC_SLEEP=y
346351
# CONFIG_RCU_TRACE is not set
347352
# CONFIG_FTRACE is not set

0 commit comments

Comments
 (0)