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

kirkwood: increase kernel size of Linksyses

Browse Source 
Linksyses Audi EA3500 and Viper E4200/E4500 have too small kernel
partition size when kernel 5.10 is used. This patch change kernel
partition to maximum size allowed by u-boot.

Kernel size is overlapping rootfs now, like mvebu Linksyses and stock
partition table. It fix  back to stock via sysupgrade, which was broken
since 18.06.

Fixes: 9808b9ae02 ("kirkwood: switch to kernel 4.9")

Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
This commit is contained in:
Pawel Dembicki 2020-04-29 18:12:51 +02:00 committed by Hauke Mehrtens
parent c5b44af2fc
commit 0dbe754e43
5 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/kirkwood/base-files/etc/board.d/05_compat-version
View File

@ -11,7 +11,7 @@ case "$(board_name)" in
linksys,e4200-v2|\ linksys,e4200-v2|\
linksys,ea3500|\ linksys,ea3500|\
linksys,ea4500) linksys,ea4500)
ucidef_set_compat_version "1.1" ucidef_set_compat_version "2.0"
;; ;;
esac esac

12
target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea3500.dts
View File

@ -165,22 +165,22 @@
partition@200000 { partition@200000 {
label = "kernel1"; label = "kernel1";
reg = <0x200000 0x290000>; reg = <0x200000 0x1400000>;
}; };
partition@490000 { partition@500000 {
label = "rootfs1"; label = "rootfs1";
reg = <0x490000 0x1170000>; reg = <0x500000 0x1100000>;
}; };
partition@1600000 { partition@1600000 {
label = "kernel2"; label = "kernel2";
reg = <0x1600000 0x290000>; reg = <0x1600000 0x1400000>;
}; };
partition@1890000 { partition@1900000 {
label = "rootfs2"; label = "rootfs2";
reg = <0x1890000 0x1170000>; reg = <0x1900000 0x1100000>;
}; };
partition@2a00000 { partition@2a00000 {

21
target/linux/kirkwood/image/Makefile
View File

@ -7,9 +7,12 @@ include $(INCLUDE_DIR)/image.mk
KERNEL_LOADADDR:=0x8000 KERNEL_LOADADDR:=0x8000
define Device/dsa-migration define Device/kernel-size-migration
DEVICE_COMPAT_VERSION := 1.1 DEVICE_COMPAT_VERSION := 2.0
DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA DEVICE_COMPAT_MESSAGE := Partition design has changed compared to \
older versions (up to 21.02) due to kernel size restrictions. \
Upgrade via sysupgrade mechanism is not possible, so new \
installation via factory style image is required.
endef endef
define Device/Default define Device/Default
@ -110,31 +113,31 @@ endef
define Device/linksys_e4200-v2 define Device/linksys_e4200-v2
$(Device/linksys) $(Device/linksys)
$(Device/dsa-migration) $(Device/kernel-size-migration)
DEVICE_MODEL := E4200 DEVICE_MODEL := E4200
DEVICE_VARIANT := v2 DEVICE_VARIANT := v2
KERNEL_SIZE := 2688k KERNEL_SIZE := 3072k
SUPPORTED_DEVICES += linksys,viper linksys-viper SUPPORTED_DEVICES += linksys,viper linksys-viper
endef endef
TARGET_DEVICES += linksys_e4200-v2 TARGET_DEVICES += linksys_e4200-v2
define Device/linksys_ea3500 define Device/linksys_ea3500
$(Device/linksys) $(Device/linksys)
$(Device/dsa-migration) $(Device/kernel-size-migration)
DEVICE_MODEL := EA3500 DEVICE_MODEL := EA3500
PAGESIZE := 512 PAGESIZE := 512
SUBPAGESIZE := 256 SUBPAGESIZE := 256
BLOCKSIZE := 16k BLOCKSIZE := 16k
KERNEL_SIZE := 2624k KERNEL_SIZE := 3072k
SUPPORTED_DEVICES += linksys,audi linksys-audi SUPPORTED_DEVICES += linksys,audi linksys-audi
endef endef
TARGET_DEVICES += linksys_ea3500 TARGET_DEVICES += linksys_ea3500
define Device/linksys_ea4500 define Device/linksys_ea4500
$(Device/linksys) $(Device/linksys)
$(Device/dsa-migration) $(Device/kernel-size-migration)
DEVICE_MODEL := EA4500 DEVICE_MODEL := EA4500
KERNEL_SIZE := 2688k KERNEL_SIZE := 3072k
SUPPORTED_DEVICES += linksys,viper linksys-viper SUPPORTED_DEVICES += linksys,viper linksys-viper
endef endef
TARGET_DEVICES += linksys_ea4500 TARGET_DEVICES += linksys_ea4500

21
target/linux/kirkwood/patches-5.10/105-linksys-viper-dts.patch
View File

@ -23,30 +23,37 @@
}; };
white-pulse { white-pulse {
@@ -114,22 +119,22 @@ @@ -114,23 +119,23 @@
}; };
partition@200000 { partition@200000 {
- label = "kernel"; - label = "kernel";
- reg = <0x200000 0x2A0000>;
+ label = "kernel1"; + label = "kernel1";
reg = <0x200000 0x2A0000>; + reg = <0x200000 0x1A00000>;
}; };
partition@4a0000 { - partition@4a0000 {
- label = "rootfs"; - label = "rootfs";
- reg = <0x4A0000 0x1760000>;
+ partition@500000 {
+ label = "rootfs1"; + label = "rootfs1";
reg = <0x4A0000 0x1760000>; + reg = <0x500000 0x1700000>;
}; };
partition@1c00000 { partition@1c00000 {
- label = "alt_kernel"; - label = "alt_kernel";
- reg = <0x1C00000 0x2A0000>;
+ label = "kernel2"; + label = "kernel2";
reg = <0x1C00000 0x2A0000>; + reg = <0x1C00000 0x1A00000>;
}; };
partition@1ea0000 { - partition@1ea0000 {
- label = "alt_rootfs"; - label = "alt_rootfs";
- reg = <0x1EA0000 0x1760000>;
+ partition@1f00000 {
+ label = "rootfs2"; + label = "rootfs2";
reg = <0x1EA0000 0x1760000>; + reg = <0x1F00000 0x1700000>;
}; };
partition@3600000 {

21
target/linux/kirkwood/patches-5.4/105-linksys-viper-dts.patch
View File

@ -23,30 +23,37 @@
}; };
white-pulse { white-pulse {
@@ -114,22 +119,22 @@ @@ -114,23 +119,23 @@
}; };
partition@200000 { partition@200000 {
- label = "kernel"; - label = "kernel";
- reg = <0x200000 0x2A0000>;
+ label = "kernel1"; + label = "kernel1";
reg = <0x200000 0x2A0000>; + reg = <0x200000 0x1A00000>;
}; };
partition@4a0000 { - partition@4a0000 {
- label = "rootfs"; - label = "rootfs";
- reg = <0x4A0000 0x1760000>;
+ partition@500000 {
+ label = "rootfs1"; + label = "rootfs1";
reg = <0x4A0000 0x1760000>; + reg = <0x500000 0x1700000>;
}; };
partition@1c00000 { partition@1c00000 {
- label = "alt_kernel"; - label = "alt_kernel";
- reg = <0x1C00000 0x2A0000>;
+ label = "kernel2"; + label = "kernel2";
reg = <0x1C00000 0x2A0000>; + reg = <0x1C00000 0x1A00000>;
}; };
partition@1ea0000 { - partition@1ea0000 {
- label = "alt_rootfs"; - label = "alt_rootfs";
- reg = <0x1EA0000 0x1760000>;
+ partition@1f00000 {
+ label = "rootfs2"; + label = "rootfs2";
reg = <0x1EA0000 0x1760000>; + reg = <0x1F00000 0x1700000>;
}; };
partition@3600000 {