From ca4832fcac83bc375a48648bd77d3283d0742128 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B8rn=20Mork?= Date: Sat, 23 Jan 2021 11:08:11 +0100 Subject: [PATCH] realtek: use vendor-specific magic for ZyXEL MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The stock firmware of the ZyXEL GS1900 series use a non-standard u-image magic. This is not enforced by the stock u-boot, which is why we could boot images with the default magic. The flash management application of the stock firmware will however verify the magic, and refuse any image with another value. Convert to vendor-specific value to get flash management support in stock firmware, including the ability to upgrade to OpenWrt directly from stock web UI. Signed-off-by: Bjørn Mork --- target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi | 3 ++- target/linux/realtek/image/Makefile | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi b/target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi index 5f06339d13..c4441ec30e 100644 --- a/target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi +++ b/target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi @@ -92,7 +92,8 @@ partition@b260000 { label = "firmware"; reg = <0x260000 0x6d0000>; - compatible = "denx,uimage"; + compatible = "openwrt,uimage", "denx,uimage"; + openwrt,ih-magic = <0x83800000>; }; partition@930000 { label = "runtime2"; diff --git a/target/linux/realtek/image/Makefile b/target/linux/realtek/image/Makefile index 87c616c3f2..c05c504ec4 100644 --- a/target/linux/realtek/image/Makefile +++ b/target/linux/realtek/image/Makefile @@ -69,6 +69,7 @@ define Device/zyxel_gs1900-10hp IMAGE_SIZE := 6976k DEVICE_VENDOR := ZyXEL DEVICE_MODEL := GS1900-10HP + UIMAGE_MAGIC := 0x83800000 endef TARGET_DEVICES += zyxel_gs1900-10hp @@ -79,6 +80,7 @@ define Device/zyxel_gs1900-8hp-v1 DEVICE_MODEL := GS1900-8HP DEVICE_VARIANT := v1 DEVICE_PACKAGES += lua-rs232 + UIMAGE_MAGIC := 0x83800000 endef TARGET_DEVICES += zyxel_gs1900-8hp-v1 @@ -89,6 +91,7 @@ define Device/zyxel_gs1900-8hp-v2 DEVICE_MODEL := GS1900-8HP DEVICE_VARIANT := v2 DEVICE_PACKAGES += lua-rs232 + UIMAGE_MAGIC := 0x83800000 endef TARGET_DEVICES += zyxel_gs1900-8hp-v2 -- 2.30.2