From 51ecfb086cda76a85e150ba2bfa2267a9167cfff Mon Sep 17 00:00:00 2001 From: Sander Vanheule Date: Sat, 17 Sep 2022 22:20:30 +0200 Subject: [PATCH] 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 --- target/linux/realtek/image/Makefile | 11 ----------- target/linux/realtek/image/common.mk | 11 +++++++++++ target/linux/realtek/image/rtl838x.mk | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/target/linux/realtek/image/Makefile b/target/linux/realtek/image/Makefile index 6165d99bfc..7d35581488 100644 --- a/target/linux/realtek/image/Makefile +++ b/target/linux/realtek/image/Makefile @@ -90,17 +90,6 @@ define Device/Default check-size | append-metadata 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 define Device/netgear_nge KERNEL := kernel-bin | append-dtb | lzma | uImage lzma diff --git a/target/linux/realtek/image/common.mk b/target/linux/realtek/image/common.mk index 59286b211d..560cf6c8e6 100644 --- a/target/linux/realtek/image/common.mk +++ b/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 | \ dlink-version | dlink-headers 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 diff --git a/target/linux/realtek/image/rtl838x.mk b/target/linux/realtek/image/rtl838x.mk index 2fe2013f70..b221ed74a2 100644 --- a/target/linux/realtek/image/rtl838x.mk +++ b/target/linux/realtek/image/rtl838x.mk @@ -64,7 +64,7 @@ endef TARGET_DEVICES += engenius_ews2910p define Device/hpe_1920-8g - $(Device/hpe_1920) + $(Build/hpe_1920) SOC := rtl8380 DEVICE_MODEL := 1920-8G (JG920A) H3C_DEVICE_ID := 0x00010023 @@ -72,7 +72,7 @@ endef TARGET_DEVICES += hpe_1920-8g define Device/hpe_1920-16g - $(Device/hpe_1920) + $(Build/hpe_1920) SOC := rtl8382 DEVICE_MODEL := 1920-16G (JG923A) H3C_DEVICE_ID := 0x00010026 @@ -80,7 +80,7 @@ endef TARGET_DEVICES += hpe_1920-16g define Device/hpe_1920-24g - $(Device/hpe_1920) + $(Build/hpe_1920) SOC := rtl8382 DEVICE_MODEL := 1920-24G (JG924A) H3C_DEVICE_ID := 0x00010027 -- 2.30.2