mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 08:51:13 +00:00
23cd9fafa8
This patch removes CONFIG_MTD_SPI_NOR_USE_4K_SECTORS from the default symbols for the ath79/mikrotik target. MikroTik devices hold some of their user-configurable settings in the soft_config partition, which is typically sized 4 KiB, of the SPI NOR flash memory. Previously, in the ar71xx target, it was possible to use 64 KiB erase sectors but also smaller 4 KiB ones when needed. This is no longer the case in ath79 with newer kernels so, to be able to write to these 4 KiB small partitions without erasing 60 KiB around, the CONFIG_MTD_SPI_NOR_USE_4K_SECTORS symbol was added to the defaults. However, this ended up making sysupgrade images which were built with 64 KiB size blocks not to keep settings (e.g., the files under /etc/config/) over the flashing process. Using 4 KiB erase sector size on the sysupgrade images (by setting BLOCKSIZE = 4k) allows keeping settings over a flashing process, but renders the process terribly slow, possibly causing a user to mistakenly force a manual device reboot while the process is still on- going. Instead, ditching the 4 KiB erase sectors for the default 64 KiB erase size provides normal SPI write speed and sysupgrade times, at the expense of not being able to modify the soft_config partition (which is rarely a required thing). An OpenWrt patch for MTD_SPI_NOR_USE_4K_SECTORS_LIMIT may once have allowed to use different per-partition erase sector sizes. Due to changes on recent kernels it now only works on a per-device basis. Also, partial eraseblock write can be performed in ath79 with kernels 5.4 and lower, by copying the blocks from the 64 KiB, erasing the whole sector and restoring those blocks not meant to be modified. A kernel bump had that patch broken for a long time, but got fixed inbf2870c. Note: the settings in the soft_config partition can be reset to their defaults by holding the reset button for 5 seconds (and less than 10 seconds) at device boot. Fixes: FS#3492 (sysupgrade […] loses settings...) Fixes:a66eee6336(ath79: add mikrotik subtarget) Signed-off-by: Roger Pueyo Centelles <roger.pueyo@guifi.net> (cherry picked from commit68d91f08ed)
42 lines
952 B
Plaintext
42 lines
952 B
Plaintext
CONFIG_CRC16=y
|
|
CONFIG_CRYPTO_DEFLATE=y
|
|
CONFIG_GPIO_LATCH=y
|
|
CONFIG_GPIO_RB4XX=y
|
|
CONFIG_GPIO_WATCHDOG=y
|
|
CONFIG_GPIO_WATCHDOG_ARCH_INITCALL=y
|
|
CONFIG_LEDS_RESET=y
|
|
CONFIG_LZO_DECOMPRESS=y
|
|
CONFIG_MDIO_GPIO=y
|
|
CONFIG_MFD_RB4XX_CPLD=y
|
|
CONFIG_MIKROTIK=y
|
|
CONFIG_MIKROTIK_RB_SYSFS=y
|
|
CONFIG_MTD_NAND=y
|
|
CONFIG_MTD_NAND_AR934X=y
|
|
CONFIG_MTD_NAND_CORE=y
|
|
CONFIG_MTD_NAND_ECC=y
|
|
CONFIG_MTD_NAND_RB4XX=y
|
|
CONFIG_MTD_NAND_RB91X=y
|
|
CONFIG_MTD_RAW_NAND=y
|
|
CONFIG_MTD_ROUTERBOOT_PARTS=y
|
|
CONFIG_MTD_SPI_NAND=y
|
|
CONFIG_MTD_SPLIT_MINOR_FW=y
|
|
CONFIG_MTD_UBI=y
|
|
CONFIG_MTD_UBI_BLOCK=y
|
|
CONFIG_MTD_UBI_WL_THRESHOLD=4096
|
|
CONFIG_MTD_UBI_BEB_LIMIT=20
|
|
CONFIG_NET_DSA=y
|
|
CONFIG_NET_SWITCHDEV=y
|
|
CONFIG_PCI_AR71XX=y
|
|
CONFIG_PHY_AR7100_USB=y
|
|
CONFIG_PHY_AR7200_USB=y
|
|
CONFIG_REGULATOR=y
|
|
CONFIG_REGULATOR_FIXED_VOLTAGE=y
|
|
CONFIG_SPI_RB4XX=y
|
|
CONFIG_UBIFS_FS=y
|
|
CONFIG_UBIFS_FS_ADVANCED_COMPR=y
|
|
CONFIG_UBIFS_FS_LZO=y
|
|
CONFIG_UBIFS_FS_ZLIB=y
|
|
CONFIG_WATCHDOG_CORE=y
|
|
CONFIG_ZLIB_DEFLATE=y
|
|
CONFIG_ZLIB_INFLATE=y
|