realtek: fix GS1900-48 firwmare partition

[openwrt/staging/nbd.git] / target / linux / realtek / image / rtl839x.mk

diff --git a/target/linux/realtek/image/rtl839x.mk b/target/linux/realtek/image/rtl839x.mk
index 1820875ffd00fed0606c5bf342e121194b106245..b5e669fce4b252fa7332b0bf7dd8692410c0c69c 100644 (file)
--- a/target/linux/realtek/image/rtl839x.mk
+++ b/target/linux/realtek/image/rtl839x.mk
@@ -1,23 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-define Device/d-link_dgs-1210
-  SOC := rtl8393
-  IMAGE_SIZE := 13824k
-  DEVICE_VENDOR := D-Link
-  DLINK_KERNEL_PART_SIZE := 1572864
-  KERNEL := kernel-bin | append-dtb | gzip | uImage gzip | dlink-cameo
-  CAMEO_KERNEL_PART := 2
-  CAMEO_ROOTFS_PART := 3
-  CAMEO_CUSTOMER_SIGNATURE := 2
-  CAMEO_BOARD_VERSION := 32
-  IMAGES += factory_image1.bin
-  IMAGE/factory_image1.bin := append-kernel | pad-to 64k | \
-        append-rootfs | pad-rootfs | pad-to 16 | check-size | \
-        dlink-version | dlink-headers
-endef
+include ./common.mk
 
 define Device/d-link_dgs-1210-52
   $(Device/d-link_dgs-1210)
+  SOC := rtl8393
   DEVICE_MODEL := DGS-1210-52
 endef
 TARGET_DEVICES += d-link_dgs-1210-52
@@ -28,7 +15,10 @@ define Device/panasonic_m48eg-pn28480k
   DEVICE_VENDOR := Panasonic
   DEVICE_MODEL := Switch-M48eG
   DEVICE_VARIANT := PN28480K
-  DEVICE_PACKAGES := kmod-hwmon-gpiofan kmod-hwmon-lm75 kmod-i2c-mux-pca954x \
+  DEVICE_PACKAGES := \
+       kmod-hwmon-gpiofan \
+       kmod-hwmon-lm75 \
+       kmod-i2c-mux-pca954x \
        kmod-thermal
 endef
 TARGET_DEVICES += panasonic_m48eg-pn28480k
@@ -40,18 +30,24 @@ define Device/tplink_sg2452p-v4
   DEVICE_VENDOR := TP-Link
   DEVICE_MODEL := SG2452P
   DEVICE_VARIANT := v4
-  DEVICE_PACKAGES := kmod-hwmon-gpiofan kmod-hwmon-tps23861
+  DEVICE_PACKAGES := \
+         kmod-hwmon-gpiofan \
+         kmod-hwmon-tps23861
 endef
 TARGET_DEVICES += tplink_sg2452p-v4
 
 define Device/zyxel_gs1900-48
   SOC := rtl8393
-  IMAGE_SIZE := 13952k
+  IMAGE_SIZE := 6976k
   DEVICE_VENDOR := ZyXEL
   UIMAGE_MAGIC := 0x83800000
-  ZYXEL_VERS := AAHO
+  ZYXEL_VERS := AAHN
   DEVICE_MODEL := GS1900-48
-  KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | zyxel-vers $$$$(ZYXEL_VERS) | \
+  KERNEL_INITRAMFS := \
+       kernel-bin | \
+       append-dtb | \
+       gzip | \
+       zyxel-vers $$$$(ZYXEL_VERS) | \
        uImage gzip
 endef
 TARGET_DEVICES += zyxel_gs1900-48