From c7d2887c41cdbcb20b88d34e0415f46f58b73502 Mon Sep 17 00:00:00 2001 From: Sander Vanheule Date: Sat, 21 Sep 2024 15:09:34 +0200 Subject: [PATCH] realtek: merge Zyxel GS1900 firmware partitions The dual-boot partition layout for the Zyxel GS1900 switches results in 6.9MB for both kernel and rootfs. Depending on the package selection, this may already leave no space for the user overlay. Merge the two firmware partitions, effectively dropping dual boot support with OpenWrt. This results in a firmware partition of 13.9MB, which should leave some room for the future. Link: https://github.com/openwrt/openwrt/issues/16439 Link: https://github.com/openwrt/openwrt/pull/16442 Tested-by: Stijn Segers Signed-off-by: Sander Vanheule --- target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi | 6 +----- target/linux/realtek/dts/rtl8393_zyxel_gs1900-48.dts | 6 +----- target/linux/realtek/image/common.mk | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi b/target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi index 5993c1b798d..b985c4bc8e4 100644 --- a/target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi +++ b/target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi @@ -91,14 +91,10 @@ }; partition@b260000 { label = "firmware"; - reg = <0x260000 0x6d0000>; + reg = <0x260000 0xda0000>; compatible = "openwrt,uimage", "denx,uimage"; openwrt,ih-magic = <0x83800000>; }; - partition@930000 { - label = "runtime2"; - reg = <0x930000 0x6d0000>; - }; }; }; }; diff --git a/target/linux/realtek/dts/rtl8393_zyxel_gs1900-48.dts b/target/linux/realtek/dts/rtl8393_zyxel_gs1900-48.dts index f049274889a..9844dc2180f 100644 --- a/target/linux/realtek/dts/rtl8393_zyxel_gs1900-48.dts +++ b/target/linux/realtek/dts/rtl8393_zyxel_gs1900-48.dts @@ -126,14 +126,10 @@ }; partition@260000 { label = "firmware"; - reg = <0x260000 0x6d0000>; + reg = <0x260000 0xda0000>; compatible = "openwrt,uimage", "denx,uimage"; openwrt,ih-magic = <0x83800000>; }; - partition@930000 { - label = "runtime2"; - reg = <0x930000 0x6d0000>; - }; }; }; }; diff --git a/target/linux/realtek/image/common.mk b/target/linux/realtek/image/common.mk index 27fcea86ece..fa2d7323725 100644 --- a/target/linux/realtek/image/common.mk +++ b/target/linux/realtek/image/common.mk @@ -58,7 +58,7 @@ endef define Device/zyxel_gs1900 DEVICE_VENDOR := Zyxel - IMAGE_SIZE := 6976k + IMAGE_SIZE := 13952k UIMAGE_MAGIC := 0x83800000 KERNEL_INITRAMFS := \ kernel-bin | \