defconfig: r64/r3/r4: disable pstore compression

and increase panic timeout else it cannot be read in uboot
frank-w · Apr 10, 2024 · b54960c · b54960c
1 parent 6101757
commit b54960c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/arch/arm64/configs/mt7622_bpi-r64_defconfig b/arch/arm64/configs/mt7622_bpi-r64_defconfig
@@ -498,13 +498,14 @@ CONFIG_ARM_PSCI_CPUIDLE=y
 CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_PSTORE=y
-#CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_COMPRESS=n
 #CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 CONFIG_PSTORE_CONSOLE=y
 #CONFIG_PSTORE_DEFLATE_COMPRESS=y
 #CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_PMSG=y
 CONFIG_PSTORE_RAM=y
+CONFIG_PANIC_TIMEOUT=10
 
 #CONFIG_BLK_DEV_INITRD=y
 #CONFIG_INITRAMFS_SOURCE="../buildroot/arm64_rootfs.cpio"

diff --git a/arch/arm64/configs/mt7986a_bpi-r3_defconfig b/arch/arm64/configs/mt7986a_bpi-r3_defconfig
@@ -398,7 +398,7 @@ CONFIG_PACKET=y
 CONFIG_PAGE_SIZE_4KB=y
 CONFIG_PANIC_ON_OOPS=y
 CONFIG_PANIC_ON_OOPS_VALUE=1
-CONFIG_PANIC_TIMEOUT=1
+CONFIG_PANIC_TIMEOUT=10
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_PCIE_BUS_DEFAULT=y
 CONFIG_PCI_QUIRKS=y
@@ -897,11 +897,11 @@ CONFIG_POWER_RESET_SYSCON=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PSTORE=y
-CONFIG_PSTORE_COMPRESS=y
-CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
+CONFIG_PSTORE_COMPRESS=n
+#CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 CONFIG_PSTORE_CONSOLE=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=y
-CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+#CONFIG_PSTORE_DEFLATE_COMPRESS=y
+#CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_PMSG=y
 CONFIG_PSTORE_RAM=y
 CONFIG_PTP_1588_CLOCK_OPTIONAL=y

diff --git a/arch/arm64/configs/mt7988a_bpi-r4_defconfig b/arch/arm64/configs/mt7988a_bpi-r4_defconfig
@@ -399,7 +399,7 @@ CONFIG_PACKET=y
 CONFIG_PAGE_SIZE_4KB=y
 CONFIG_PANIC_ON_OOPS=y
 CONFIG_PANIC_ON_OOPS_VALUE=1
-CONFIG_PANIC_TIMEOUT=1
+CONFIG_PANIC_TIMEOUT=10
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_PCIE_BUS_DEFAULT=y
 CONFIG_PCI_QUIRKS=y
@@ -897,11 +897,11 @@ CONFIG_POWER_RESET_SYSCON=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PSTORE=y
-CONFIG_PSTORE_COMPRESS=y
-CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
+CONFIG_PSTORE_COMPRESS=n
+#CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 CONFIG_PSTORE_CONSOLE=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=y
-CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+#CONFIG_PSTORE_DEFLATE_COMPRESS=y
+#CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_PMSG=y
 CONFIG_PSTORE_RAM=y
 CONFIG_PTP_1588_CLOCK_OPTIONAL=y