From 1b39b665c32416f1d9e88fa6bdc986d81787e833 Mon Sep 17 00:00:00 2001 From: Stefan Lippers-Hollmann Date: Fri, 18 May 2018 04:18:17 +0200 Subject: [PATCH] ipq806x: increase kernel partition size for the Netgear Nighthawk X4 R7500v2 Starting with kernel 4.14 and gcc 7, the kernel doesn't fit into the 2 MB reserved for the kernel partition by the OEM firmware anymore. This patch increases the kernel partition from 2 MB to 4 MB, at the expense of the rootfs, for all supported kernels. WARNING: This breaks sysupgrade! Flashing a firmware containing this changed partitioning from an older image with 2 MB reserved for the kernel partion requires the tftp recovery procedure, thereby losing all settings. This change follows the functional example of the Netgear r7800, but has not been runtime tested on a Netgear Nighthawk X4 R7500v2. Signed-off-by: Stefan Lippers-Hollmann (cherry picked from commit c3af761e4740820a29e993414d3d2f49c7eff6e7) --- .../files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts | 6 +++--- .../files-4.9/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts | 6 +++--- target/linux/ipq806x/image/Makefile | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts index c4b0c4b5a7..da0ac5b68e 100644 --- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts +++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts @@ -252,12 +252,12 @@ kernel@1480000 { label = "kernel"; - reg = <0x1480000 0x0200000>; + reg = <0x1480000 0x0400000>; }; - ubi@1680000 { + ubi@1880000 { label = "ubi"; - reg = <0x1680000 0x1E00000>; + reg = <0x1880000 0x1C00000>; }; netgear@3480000 { diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts index c4b0c4b5a7..da0ac5b68e 100644 --- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts +++ b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts @@ -252,12 +252,12 @@ kernel@1480000 { label = "kernel"; - reg = <0x1480000 0x0200000>; + reg = <0x1480000 0x0400000>; }; - ubi@1680000 { + ubi@1880000 { label = "ubi"; - reg = <0x1680000 0x1E00000>; + reg = <0x1880000 0x1C00000>; }; netgear@3480000 { diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile index 5a1faa3ead..68b039b3ae 100644 --- a/target/linux/ipq806x/image/Makefile +++ b/target/linux/ipq806x/image/Makefile @@ -134,7 +134,7 @@ TARGET_DEVICES += netgear_r7500 define Device/netgear_r7500v2 $(call Device/DniImage) DEVICE_DTS := qcom-ipq8064-r7500v2 - KERNEL_SIZE := 2097152 + KERNEL_SIZE := 4194304 NETGEAR_BOARD_ID := R7500v2 NETGEAR_HW_ID := 29764958+0+128+512+3x3+4x4 BLOCKSIZE := 128k -- 2.30.2