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>
linksys,e4200-v2|\
linksys,ea3500|\
linksys,ea4500)
linksys,e4200-v2|\
linksys,ea3500|\
linksys,ea4500)
- ucidef_set_compat_version "1.1"
+ ucidef_set_compat_version "2.0"
partition@200000 {
label = "kernel1";
partition@200000 {
label = "kernel1";
- reg = <0x200000 0x290000>;
+ reg = <0x200000 0x1400000>;
- reg = <0x490000 0x1170000>;
+ reg = <0x500000 0x1100000>;
};
partition@1600000 {
label = "kernel2";
};
partition@1600000 {
label = "kernel2";
- reg = <0x1600000 0x290000>;
+ reg = <0x1600000 0x1400000>;
- reg = <0x1890000 0x1170000>;
+ reg = <0x1900000 0x1100000>;
-define Device/dsa-migration
- DEVICE_COMPAT_VERSION := 1.1
- DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA
+define Device/kernel-size-migration
+ DEVICE_COMPAT_VERSION := 2.0
+ 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
define Device/Default
endef
define Device/Default
define Device/linksys_e4200-v2
$(Device/linksys)
define Device/linksys_e4200-v2
$(Device/linksys)
- $(Device/dsa-migration)
+ $(Device/kernel-size-migration)
DEVICE_MODEL := E4200
DEVICE_VARIANT := v2
DEVICE_MODEL := E4200
DEVICE_VARIANT := v2
SUPPORTED_DEVICES += linksys,viper linksys-viper
endef
TARGET_DEVICES += linksys_e4200-v2
define Device/linksys_ea3500
$(Device/linksys)
SUPPORTED_DEVICES += linksys,viper linksys-viper
endef
TARGET_DEVICES += linksys_e4200-v2
define Device/linksys_ea3500
$(Device/linksys)
- $(Device/dsa-migration)
+ $(Device/kernel-size-migration)
DEVICE_MODEL := EA3500
PAGESIZE := 512
SUBPAGESIZE := 256
BLOCKSIZE := 16k
DEVICE_MODEL := EA3500
PAGESIZE := 512
SUBPAGESIZE := 256
BLOCKSIZE := 16k
SUPPORTED_DEVICES += linksys,audi linksys-audi
endef
TARGET_DEVICES += linksys_ea3500
define Device/linksys_ea4500
$(Device/linksys)
SUPPORTED_DEVICES += linksys,audi linksys-audi
endef
TARGET_DEVICES += linksys_ea3500
define Device/linksys_ea4500
$(Device/linksys)
- $(Device/dsa-migration)
+ $(Device/kernel-size-migration)
SUPPORTED_DEVICES += linksys,viper linksys-viper
endef
TARGET_DEVICES += linksys_ea4500
SUPPORTED_DEVICES += linksys,viper linksys-viper
endef
TARGET_DEVICES += linksys_ea4500
};
partition@200000 {
- label = "kernel";
};
partition@200000 {
- label = "kernel";
+- reg = <0x200000 0x2A0000>;
- reg = <0x200000 0x2A0000>;
++ reg = <0x200000 0x1A00000>;
+- reg = <0x4A0000 0x1760000>;
++ partition@500000 {
- reg = <0x4A0000 0x1760000>;
++ reg = <0x500000 0x1700000>;
};
partition@1c00000 {
- label = "alt_kernel";
};
partition@1c00000 {
- label = "alt_kernel";
+- reg = <0x1C00000 0x2A0000>;
- reg = <0x1C00000 0x2A0000>;
++ reg = <0x1C00000 0x1A00000>;
+- reg = <0x1EA0000 0x1760000>;
++ partition@1f00000 {
- reg = <0x1EA0000 0x1760000>;
++ reg = <0x1F00000 0x1700000>;
};
partition@200000 {
- label = "kernel";
};
partition@200000 {
- label = "kernel";
+- reg = <0x200000 0x2A0000>;
- reg = <0x200000 0x2A0000>;
++ reg = <0x200000 0x1A00000>;
+- reg = <0x4A0000 0x1760000>;
++ partition@500000 {
- reg = <0x4A0000 0x1760000>;
++ reg = <0x500000 0x1700000>;
};
partition@1c00000 {
- label = "alt_kernel";
};
partition@1c00000 {
- label = "alt_kernel";
+- reg = <0x1C00000 0x2A0000>;
- reg = <0x1C00000 0x2A0000>;
++ reg = <0x1C00000 0x1A00000>;
+- reg = <0x1EA0000 0x1760000>;
++ partition@1f00000 {
- reg = <0x1EA0000 0x1760000>;
++ reg = <0x1F00000 0x1700000>;