mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-29 16:58:46 +00:00
9d531c0c5b
kernel 6.9 removed the KConfig entry our RouterBOOT watchdog pet hack was relying on:
Linux df59427a1122 ("ARM: qcom: merge remaining subplatforms into sensible Kconfig entry")
Introduce a new specific KConfig entry for this hack,
and enable it for Mikrotik ipq40xx kernel.
CONFIG_ARCH_QCOM_IPQ40XX_BOOT_COMPRESSED_PET_WATCHDOG_EARLY
With appropriate DEBUG_LL and DEBUG_UNCOMPRESS, this watchdog reset
can be typically seen on console as a reset before "Uncompressing Linux..."
reaches " done, booting the kernel."
RouterBOOT
loading kernel... OK
setting up elf image... OK
jumping to kernel code
Jumping to kernel
DTB:0x80381A60 (0x000048C4)
C:0x800000E0-0x80386420->0x80FAB500-0x81331840
DTB:0x8132CE80 (0x000049B8)
Uncompressing Linux...
Format: Log Type - Time(microsec) - Message - Optional Info
Log Type: B - Since Boot(Power On Reset), D - Delta, S - Statistic
S - QC_IMAGE_VERSION_STRING=BOOT.BF.3.1.1-00096
versus:
Uncompressing Linux... done, booting the kernel.
[ 0.000000] Booting Linux on physical CPU 0x0
On Mikrotik RouterBOOT devices, this is complicated by some RouterBOOT
versions successfully loading the same kernel that other RouterBOOT versions fail. Example:
RouterBOOT backup booter 6.45.9 fine, RouterBOOT booter 7.16 fail
Fixes: openwrt#19841
Signed-off-by: John Thomson <git@johnthomson.fastmail.com.au>
Link: https://github.com/openwrt/openwrt/pull/20305
Signed-off-by: Robert Marko <robimarko@gmail.com>
16 lines
454 B
Plaintext
16 lines
454 B
Plaintext
CONFIG_ARCH_QCOM_IPQ40XX_BOOT_COMPRESSED_PET_WATCHDOG_EARLY=y
|
|
CONFIG_CRYPTO_HASH_INFO=y
|
|
CONFIG_MIKROTIK=y
|
|
CONFIG_MIKROTIK_RB_SYSFS=y
|
|
CONFIG_MIKROTIK_WLAN_DECOMPRESS_LZ77=y
|
|
CONFIG_MTD_ROUTERBOOT_PARTS=y
|
|
CONFIG_MTD_SPI_NOR_USE_VARIABLE_ERASE=y
|
|
CONFIG_MTD_SPLIT_MINOR_FW=y
|
|
CONFIG_MTD_UBI=y
|
|
CONFIG_MTD_UBI_BEB_LIMIT=20
|
|
CONFIG_MTD_UBI_BLOCK=y
|
|
CONFIG_MTD_UBI_NVMEM=y
|
|
CONFIG_MTD_UBI_WL_THRESHOLD=4096
|
|
# CONFIG_NVMEM_LAYOUT_MIKROTIK is not set
|
|
CONFIG_UBIFS_FS=y
|