realtek: deduplicate GS1900 recipes

ZyXEL GS1900 devices with SoCs from both the RTL838x and RTL839x
families share the same image structure and size of the firmware
partition. Additionally, the GS1900-48 recipe provided a parameter for
the zyxel-vers command, but this parameter is not used. Deduplicate the
recipes by moving it to target/linux/realtek/image/common.mk.

Signed-off-by: Sander Vanheule <sander@svanheule.net>

diff --git a/target/linux/realtek/image/common.mk b/target/linux/realtek/image/common.mk
index 0c5152956967a75e43eda651c86bf10283a24fee..702158978fa1e180887df8e42d0ee84f8b32a81e 100644 (file)
--- a/target/linux/realtek/image/common.mk
+++ b/target/linux/realtek/image/common.mk
@@ -52,3 +52,15 @@ define Device/hpe_1920
        check-size | \
        append-metadata
 endef
+
+define Device/zyxel_gs1900
+  DEVICE_VENDOR := ZyXEL
+  IMAGE_SIZE := 6976k
+  UIMAGE_MAGIC := 0x83800000
+  KERNEL_INITRAMFS := \
+       kernel-bin | \
+       append-dtb | \
+       gzip | \
+       zyxel-vers | \
+       uImage gzip
+endef

diff --git a/target/linux/realtek/image/rtl838x.mk b/target/linux/realtek/image/rtl838x.mk
index 6d6701154978849340e05c191578e9e649c03c6b..8727bfa6fb1ddc50c6fabb52816d6c3f38bf6ace 100644 (file)
--- a/target/linux/realtek/image/rtl838x.mk
+++ b/target/linux/realtek/image/rtl838x.mk
@@ -218,21 +218,9 @@ define Device/tplink_sg2210p-v3
 endef
 TARGET_DEVICES += tplink_sg2210p-v3
 
-define Device/zyxel_gs1900
-  SOC := rtl8380
-  IMAGE_SIZE := 6976k
-  DEVICE_VENDOR := ZyXEL
-  UIMAGE_MAGIC := 0x83800000
-  KERNEL_INITRAMFS := \
-       kernel-bin | \
-       append-dtb | \
-       gzip | \
-       zyxel-vers | \
-       uImage gzip
-endef
-
 define Device/zyxel_gs1900-10hp
   $(Device/zyxel_gs1900)
+  SOC := rtl8380
   DEVICE_MODEL := GS1900-10HP
   ZYXEL_VERS := AAZI
 endef
@@ -248,6 +236,7 @@ TARGET_DEVICES += zyxel_gs1900-16
 
 define Device/zyxel_gs1900-8
   $(Device/zyxel_gs1900)
+  SOC := rtl8380
   DEVICE_MODEL := GS1900-8
   ZYXEL_VERS := AAHH
 endef
@@ -255,6 +244,7 @@ TARGET_DEVICES += zyxel_gs1900-8
 
 define Device/zyxel_gs1900-8hp-v1
   $(Device/zyxel_gs1900)
+  SOC := rtl8380
   DEVICE_MODEL := GS1900-8HP
   DEVICE_VARIANT := v1
   ZYXEL_VERS := AAHI
@@ -264,6 +254,7 @@ TARGET_DEVICES += zyxel_gs1900-8hp-v1
 
 define Device/zyxel_gs1900-8hp-v2
   $(Device/zyxel_gs1900)
+  SOC := rtl8380
   DEVICE_MODEL := GS1900-8HP
   DEVICE_VARIANT := v2
   ZYXEL_VERS := AAHI

diff --git a/target/linux/realtek/image/rtl839x.mk b/target/linux/realtek/image/rtl839x.mk
index b5e669fce4b252fa7332b0bf7dd8692410c0c69c..e9f47786dc8b8afad4aeb9ac1ade34c5e8d574ba 100644 (file)
--- a/target/linux/realtek/image/rtl839x.mk
+++ b/target/linux/realtek/image/rtl839x.mk
@@ -37,17 +37,9 @@ endef
 TARGET_DEVICES += tplink_sg2452p-v4
 
 define Device/zyxel_gs1900-48
+  $(Device/zyxel_gs1900)
   SOC := rtl8393
-  IMAGE_SIZE := 6976k
-  DEVICE_VENDOR := ZyXEL
-  UIMAGE_MAGIC := 0x83800000
-  ZYXEL_VERS := AAHN
   DEVICE_MODEL := GS1900-48
-  KERNEL_INITRAMFS := \
-       kernel-bin | \
-       append-dtb | \
-       gzip | \
-       zyxel-vers $$$$(ZYXEL_VERS) | \
-       uImage gzip
+  ZYXEL_VERS := AAHN
 endef
 TARGET_DEVICES += zyxel_gs1900-48