Răsfoiți Sursa

realtek: move hpe_1920 recipe to common.mk

Currently supported HPE 1920 devices all have an RTL838x SoC, but there
are larger switches with RTL839x SoCs, although currently not supported.
Move the build recipe to common.mk so the larger devices can also make
use of the recipe, while moving it out of the main Makefile.

Signed-off-by: Sander Vanheule <[email protected]>
Sander Vanheule 3 ani în urmă
părinte
comite
51ecfb086c

+ 0 - 11
target/linux/realtek/image/Makefile

@@ -90,17 +90,6 @@ define Device/Default
 	check-size | append-metadata
 	check-size | append-metadata
 endef
 endef
 
 
-define Device/hpe_1920
-  DEVICE_VENDOR := HPE
-  IMAGE_SIZE := 29632k
-  BLOCKSIZE := 64k
-  H3C_PRODUCT_ID := 0x3c010501
-  KERNEL := kernel-bin | append-dtb | relocate-kernel | 7z | h3c-image | h3c-vfs
-  KERNEL_INITRAMFS := kernel-bin | append-dtb | relocate-kernel | 7z | h3c-image
-  IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \
-  	pad-rootfs | check-size | append-metadata
-endef
-
 # "NGE" refers to the uImage magic
 # "NGE" refers to the uImage magic
 define Device/netgear_nge
 define Device/netgear_nge
   KERNEL := kernel-bin | append-dtb | lzma | uImage lzma
   KERNEL := kernel-bin | append-dtb | lzma | uImage lzma

+ 11 - 0
target/linux/realtek/image/common.mk

@@ -14,3 +14,14 @@ define Build/d-link_dgs-1210
         append-rootfs | pad-rootfs | pad-to 16 | check-size | \
         append-rootfs | pad-rootfs | pad-to 16 | check-size | \
         dlink-version | dlink-headers
         dlink-version | dlink-headers
 endef
 endef
+
+define Build/hpe_1920
+  DEVICE_VENDOR := HPE
+  IMAGE_SIZE := 29632k
+  BLOCKSIZE := 64k
+  H3C_PRODUCT_ID := 0x3c010501
+  KERNEL := kernel-bin | append-dtb | relocate-kernel | 7z | h3c-image | h3c-vfs
+  KERNEL_INITRAMFS := kernel-bin | append-dtb | relocate-kernel | 7z | h3c-image
+  IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \
+	pad-rootfs | check-size | append-metadata
+endef

+ 3 - 3
target/linux/realtek/image/rtl838x.mk

@@ -64,7 +64,7 @@ endef
 TARGET_DEVICES += engenius_ews2910p
 TARGET_DEVICES += engenius_ews2910p
 
 
 define Device/hpe_1920-8g
 define Device/hpe_1920-8g
-  $(Device/hpe_1920)
+  $(Build/hpe_1920)
   SOC := rtl8380
   SOC := rtl8380
   DEVICE_MODEL := 1920-8G (JG920A)
   DEVICE_MODEL := 1920-8G (JG920A)
   H3C_DEVICE_ID := 0x00010023
   H3C_DEVICE_ID := 0x00010023
@@ -72,7 +72,7 @@ endef
 TARGET_DEVICES += hpe_1920-8g
 TARGET_DEVICES += hpe_1920-8g
 
 
 define Device/hpe_1920-16g
 define Device/hpe_1920-16g
-  $(Device/hpe_1920)
+  $(Build/hpe_1920)
   SOC := rtl8382
   SOC := rtl8382
   DEVICE_MODEL := 1920-16G (JG923A)
   DEVICE_MODEL := 1920-16G (JG923A)
   H3C_DEVICE_ID := 0x00010026
   H3C_DEVICE_ID := 0x00010026
@@ -80,7 +80,7 @@ endef
 TARGET_DEVICES += hpe_1920-16g
 TARGET_DEVICES += hpe_1920-16g
 
 
 define Device/hpe_1920-24g
 define Device/hpe_1920-24g
-  $(Device/hpe_1920)
+  $(Build/hpe_1920)
   SOC := rtl8382
   SOC := rtl8382
   DEVICE_MODEL := 1920-24G (JG924A)
   DEVICE_MODEL := 1920-24G (JG924A)
   H3C_DEVICE_ID := 0x00010027
   H3C_DEVICE_ID := 0x00010027