Skip to content

Commit b54960c

Browse files
committed
defconfig: r64/r3/r4: disable pstore compression
and increase panic timeout else it cannot be read in uboot
1 parent 6101757 commit b54960c

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

arch/arm64/configs/mt7622_bpi-r64_defconfig

+2-1
Original file line numberDiff line numberDiff line change
@@ -498,13 +498,14 @@ CONFIG_ARM_PSCI_CPUIDLE=y
498498
CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
499499
CONFIG_MISC_FILESYSTEMS=y
500500
CONFIG_PSTORE=y
501-
#CONFIG_PSTORE_COMPRESS=y
501+
CONFIG_PSTORE_COMPRESS=n
502502
#CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
503503
CONFIG_PSTORE_CONSOLE=y
504504
#CONFIG_PSTORE_DEFLATE_COMPRESS=y
505505
#CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
506506
CONFIG_PSTORE_PMSG=y
507507
CONFIG_PSTORE_RAM=y
508+
CONFIG_PANIC_TIMEOUT=10
508509

509510
#CONFIG_BLK_DEV_INITRD=y
510511
#CONFIG_INITRAMFS_SOURCE="../buildroot/arm64_rootfs.cpio"

arch/arm64/configs/mt7986a_bpi-r3_defconfig

+5-5
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ CONFIG_PACKET=y
398398
CONFIG_PAGE_SIZE_4KB=y
399399
CONFIG_PANIC_ON_OOPS=y
400400
CONFIG_PANIC_ON_OOPS_VALUE=1
401-
CONFIG_PANIC_TIMEOUT=1
401+
CONFIG_PANIC_TIMEOUT=10
402402
CONFIG_PARTITION_ADVANCED=y
403403
CONFIG_PCIE_BUS_DEFAULT=y
404404
CONFIG_PCI_QUIRKS=y
@@ -897,11 +897,11 @@ CONFIG_POWER_RESET_SYSCON=y
897897
CONFIG_POWER_SUPPLY=y
898898
CONFIG_PRINTK_TIME=y
899899
CONFIG_PSTORE=y
900-
CONFIG_PSTORE_COMPRESS=y
901-
CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
900+
CONFIG_PSTORE_COMPRESS=n
901+
#CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
902902
CONFIG_PSTORE_CONSOLE=y
903-
CONFIG_PSTORE_DEFLATE_COMPRESS=y
904-
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
903+
#CONFIG_PSTORE_DEFLATE_COMPRESS=y
904+
#CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
905905
CONFIG_PSTORE_PMSG=y
906906
CONFIG_PSTORE_RAM=y
907907
CONFIG_PTP_1588_CLOCK_OPTIONAL=y

arch/arm64/configs/mt7988a_bpi-r4_defconfig

+5-5
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ CONFIG_PACKET=y
399399
CONFIG_PAGE_SIZE_4KB=y
400400
CONFIG_PANIC_ON_OOPS=y
401401
CONFIG_PANIC_ON_OOPS_VALUE=1
402-
CONFIG_PANIC_TIMEOUT=1
402+
CONFIG_PANIC_TIMEOUT=10
403403
CONFIG_PARTITION_ADVANCED=y
404404
CONFIG_PCIE_BUS_DEFAULT=y
405405
CONFIG_PCI_QUIRKS=y
@@ -897,11 +897,11 @@ CONFIG_POWER_RESET_SYSCON=y
897897
CONFIG_POWER_SUPPLY=y
898898
CONFIG_PRINTK_TIME=y
899899
CONFIG_PSTORE=y
900-
CONFIG_PSTORE_COMPRESS=y
901-
CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
900+
CONFIG_PSTORE_COMPRESS=n
901+
#CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
902902
CONFIG_PSTORE_CONSOLE=y
903-
CONFIG_PSTORE_DEFLATE_COMPRESS=y
904-
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
903+
#CONFIG_PSTORE_DEFLATE_COMPRESS=y
904+
#CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
905905
CONFIG_PSTORE_PMSG=y
906906
CONFIG_PSTORE_RAM=y
907907
CONFIG_PTP_1588_CLOCK_OPTIONAL=y

0 commit comments

Comments
 (0)