realtek: support web vendor upgrade for XMG1915-10E

So far the XMG1915-10E used the rt-loader-bootbase recipe which
produces a separate loader.bin and only allows installation/upgrade
from the CLI side, not via the Zyxel web UI.

Switch to the standard zyxel_zynos image recipe shared with the other
Zyxel rtl930x devices. The loader now lives inside the 'factory'
parent partition introduced in the previous commit, so the resulting
single sysupgrade image can be flashed both from the vendor web UI
and via sysupgrade. Hook the device into the existing xs1930 case in
platform.sh which sets PART_NAME=factory and calls default_do_upgrade.

This makes the installation and revert procedure in 94607d6285cc
("realtek: add support for Zyxel XMG1915-10E") mostly obsolete and
partly not working anymore (due to different build images that are
emitted).

Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/23218
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/realtek/base-files/lib/upgrade/platform.sh b/target/linux/realtek/base-files/lib/upgrade/platform.sh
index c2b11bceac146b42e975298573bf3f8fecf31109..27bc0ba8dcdfc7beee589762a5089de0c8e48fd8 100644 (file)
--- a/target/linux/realtek/base-files/lib/upgrade/platform.sh
+++ b/target/linux/realtek/base-files/lib/upgrade/platform.sh
@@ -44,6 +44,7 @@ platform_do_upgrade() {
        linksys,lgs352c)
                nand_do_upgrade "$1"
                ;;
+       zyxel,xmg1915-10e|\
        zyxel,xs1930-10|\
        zyxel,xs1930-12f|\
        zyxel,xs1930-12hp)

diff --git a/target/linux/realtek/image/rtl930x.mk b/target/linux/realtek/image/rtl930x.mk
index df5c16c6e321d69680ff51bbec34d9dee96a173d..9fb843f3bd6df62bae1873e90836b2bb152cd011 100644 (file)
--- a/target/linux/realtek/image/rtl930x.mk
+++ b/target/linux/realtek/image/rtl930x.mk
@@ -228,17 +228,10 @@ TARGET_DEVICES += zyxel_xgs1250-12-b1
 
 define Device/zyxel_xmg1915-10e
   SOC := rtl9302
-  ZYXEL_VERS := ABWE
-  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := XMG1915-10E
   FLASH_ADDR := 0xb4270000
-ifeq ($(IB),)
-  ARTIFACTS := loader.bin
-  ARTIFACT/loader.bin := \
-    rt-loader-standalone | \
-    zynsig
-endif
-  $(Device/rt-loader-bootbase)
   IMAGE_SIZE := 30336k
+  ZYNFW_ALIGN := 0x10000
+  $(Device/zyxel_zynos)
 endef
 TARGET_DEVICES += zyxel_xmg1915-10e