Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipq806x: Increase kernel size to 4 MB for EA8500/EA7500v1

Browse Source 
Increase the kernel size from 3 MB to 4 MB for EA8500 and EA7500v1.
* modify the common .dtsi
* modify the kernel size in the image recipes

Define compat-version 2.0 to force factory image usage for sysupgrade.
Add explanation message. Reenable both devices.

As for 4MiB (and not more): Hannu Nyman noted that:
"We have lots of ipq806x devices with 4 MB kernel, so will
need action at that point in future in any case.
(Assuming that the bootloader did not have a 4 MB limit that
has been tested...)"

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(squashed, added 4MiB notice of support in ipq806x)
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
This commit is contained in:
Hannu Nyman 2022-02-24 18:31:48 +02:00 committed by Christian Lamparter
parent 7ac8da0060
commit ec32c4ef01
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target/linux/ipq806x/base-files/etc/uci-defaults/05_fix-compat-version Normal file
View File

@ -0,0 +1,11 @@
. /lib/functions.sh
case "$(board_name)" in
linksys,ea7500-v1|\
linksys,ea8500)
uci set system.@system[0].compat_version="2.0"
uci commit system
;;
esac
exit 0

10
target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-eax500.dtsi
View File

@ -133,12 +133,12 @@
partition@f80000 { partition@f80000 {
label = "kernel1"; label = "kernel1";
reg = <0x0f80000 0x2800000>; /* 3 MB spill to rootfs */ reg = <0x0f80000 0x2800000>; /* 4 MB, spill to rootfs */
}; };
partition@1280000 { partition@1380000 {
label = "rootfs1"; label = "rootfs1";
reg = <0x1280000 0x2500000>; reg = <0x1380000 0x2400000>;
}; };
partition@3780000 { partition@3780000 {
@ -146,9 +146,9 @@
reg = <0x3780000 0x2800000>; reg = <0x3780000 0x2800000>;
}; };
partition@3a80000 { partition@3b80000 {
label = "rootfs2"; label = "rootfs2";
reg = <0x3a80000 0x2500000>; reg = <0x3b80000 0x2400000>;
}; };
}; };
}; };

15
target/linux/ipq806x/image/generic.mk
View File

@ -1,6 +1,13 @@
DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
DEVICE_VARS += TPLINK_BOARD_ID DEVICE_VARS += TPLINK_BOARD_ID
define Device/kernel-size-migration
DEVICE_COMPAT_VERSION := 2.0
DEVICE_COMPAT_MESSAGE := *** Kernel partition size has changed from earlier \
versions. You need to sysupgrade with the OpenWrt factory image and \
use the force flag when image check fails. Settings will be lost. ***
endef
define Build/buffalo-rootfs-cksum define Build/buffalo-rootfs-cksum
( \ ( \
echo -ne "\x$$(od -A n -t u1 $@ | tr -s ' ' '\n' | \ echo -ne "\x$$(od -A n -t u1 $@ | tr -s ' ' '\n' | \
@ -128,13 +135,14 @@ TARGET_DEVICES += edgecore_ecw5410
define Device/linksys_ea7500-v1 define Device/linksys_ea7500-v1
$(call Device/LegacyImage) $(call Device/LegacyImage)
$(Device/kernel-size-migration)
DEVICE_VENDOR := Linksys DEVICE_VENDOR := Linksys
DEVICE_MODEL := EA7500 DEVICE_MODEL := EA7500
DEVICE_VARIANT := v1 DEVICE_VARIANT := v1
SOC := qcom-ipq8064 SOC := qcom-ipq8064
PAGESIZE := 2048 PAGESIZE := 2048
BLOCKSIZE := 128k BLOCKSIZE := 128k
KERNEL_SIZE := 3072k KERNEL_SIZE := 4096k
KERNEL = kernel-bin | append-dtb | uImage none | \ KERNEL = kernel-bin | append-dtb | uImage none | \
append-uImage-fakehdr filesystem append-uImage-fakehdr filesystem
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
@ -142,18 +150,18 @@ define Device/linksys_ea7500-v1
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | \ IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | \
append-ubi | pad-to $$$$(PAGESIZE) append-ubi | pad-to $$$$(PAGESIZE)
DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct
DEFAULT := n
endef endef
TARGET_DEVICES += linksys_ea7500-v1 TARGET_DEVICES += linksys_ea7500-v1
define Device/linksys_ea8500 define Device/linksys_ea8500
$(call Device/LegacyImage) $(call Device/LegacyImage)
$(Device/kernel-size-migration)
DEVICE_VENDOR := Linksys DEVICE_VENDOR := Linksys
DEVICE_MODEL := EA8500 DEVICE_MODEL := EA8500
SOC := qcom-ipq8064 SOC := qcom-ipq8064
PAGESIZE := 2048 PAGESIZE := 2048
BLOCKSIZE := 128k BLOCKSIZE := 128k
KERNEL_SIZE := 3072k KERNEL_SIZE := 4096k
KERNEL = kernel-bin | append-dtb | uImage none | \ KERNEL = kernel-bin | append-dtb | uImage none | \
append-uImage-fakehdr filesystem append-uImage-fakehdr filesystem
BOARD_NAME := ea8500 BOARD_NAME := ea8500
@ -163,7 +171,6 @@ define Device/linksys_ea8500
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | \ IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | \
append-ubi append-ubi
DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct
DEFAULT := n
endef endef
TARGET_DEVICES += linksys_ea8500 TARGET_DEVICES += linksys_ea8500