[openwrt/openwrt] realtek: use Device prefix for common recipes

LEDE Commits lede-commits at lists.infradead.org
Sun Sep 18 01:15:29 PDT 2022


svanheule pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/fe5a2f334f00d26aaba457f258ed1be939f1bba5

commit fe5a2f334f00d26aaba457f258ed1be939f1bba5
Author: Sander Vanheule <sander at svanheule.net>
AuthorDate: Sun Sep 18 10:12:16 2022 +0200

    realtek: use Device prefix for common recipes
    
    The Build prefix is used for image build commands, while the Device
    prefix should be used for base recipes for devices. Apply the same
    naming convention here.
    
    While touching the file, also fix the mixed indentation.
    
    Suggested-by: INAGAKI Hiroshi <musashino.open at gmail.com>
    Signed-off-by: Sander Vanheule <sander at svanheule.net>
---
 target/linux/realtek/image/common.mk  |  8 ++++----
 target/linux/realtek/image/rtl838x.mk | 16 ++++++++--------
 target/linux/realtek/image/rtl839x.mk |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/target/linux/realtek/image/common.mk b/target/linux/realtek/image/common.mk
index 560cf6c8e6..9d84ec08f5 100644
--- a/target/linux/realtek/image/common.mk
+++ b/target/linux/realtek/image/common.mk
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-define Build/d-link_dgs-1210
+define Device/d-link_dgs-1210
   IMAGE_SIZE := 13824k
   DEVICE_VENDOR := D-Link
   DLINK_KERNEL_PART_SIZE := 1572864
@@ -11,11 +11,11 @@ define Build/d-link_dgs-1210
   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
+	append-rootfs | pad-rootfs | pad-to 16 | check-size | \
+	dlink-version | dlink-headers
 endef
 
-define Build/hpe_1920
+define Device/hpe_1920
   DEVICE_VENDOR := HPE
   IMAGE_SIZE := 29632k
   BLOCKSIZE := 64k
diff --git a/target/linux/realtek/image/rtl838x.mk b/target/linux/realtek/image/rtl838x.mk
index a4f02ba352..c33ac7c5c4 100644
--- a/target/linux/realtek/image/rtl838x.mk
+++ b/target/linux/realtek/image/rtl838x.mk
@@ -13,7 +13,7 @@ endef
 TARGET_DEVICES += allnet_all-sg8208m
 
 define Device/d-link_dgs-1210-10mp-f
-  $(Build/d-link_dgs-1210)
+  $(Device/d-link_dgs-1210)
   SOC := rtl8380
   DEVICE_MODEL := DGS-1210-10MP
   DEVICE_VARIANT := F
@@ -22,7 +22,7 @@ endef
 TARGET_DEVICES += d-link_dgs-1210-10mp-f
 
 define Device/d-link_dgs-1210-10p
-  $(Build/d-link_dgs-1210)
+  $(Device/d-link_dgs-1210)
   SOC := rtl8382
   DEVICE_MODEL := DGS-1210-10P
   DEVICE_PACKAGES += lua-rs232
@@ -30,21 +30,21 @@ endef
 TARGET_DEVICES += d-link_dgs-1210-10p
 
 define Device/d-link_dgs-1210-16
-  $(Build/d-link_dgs-1210)
+  $(Device/d-link_dgs-1210)
   SOC := rtl8382
   DEVICE_MODEL := DGS-1210-16
 endef
 TARGET_DEVICES += d-link_dgs-1210-16
 
 define Device/d-link_dgs-1210-20
-  $(Build/d-link_dgs-1210)
+  $(Device/d-link_dgs-1210)
   SOC := rtl8382
   DEVICE_MODEL := DGS-1210-20
 endef
 TARGET_DEVICES += d-link_dgs-1210-20
 
 define Device/d-link_dgs-1210-28
-  $(Build/d-link_dgs-1210)
+  $(Device/d-link_dgs-1210)
   SOC := rtl8382
   DEVICE_MODEL := DGS-1210-28
 endef
@@ -64,7 +64,7 @@ endef
 TARGET_DEVICES += engenius_ews2910p
 
 define Device/hpe_1920-8g
-  $(Build/hpe_1920)
+  $(Device/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
-  $(Build/hpe_1920)
+  $(Device/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
-  $(Build/hpe_1920)
+  $(Device/hpe_1920)
   SOC := rtl8382
   DEVICE_MODEL := 1920-24G (JG924A)
   H3C_DEVICE_ID := 0x00010027
diff --git a/target/linux/realtek/image/rtl839x.mk b/target/linux/realtek/image/rtl839x.mk
index f4704544a6..74ae95ccd7 100644
--- a/target/linux/realtek/image/rtl839x.mk
+++ b/target/linux/realtek/image/rtl839x.mk
@@ -3,7 +3,7 @@
 include ./common.mk
 
 define Device/d-link_dgs-1210-52
-  $(Build/d-link_dgs-1210)
+  $(Device/d-link_dgs-1210)
   SOC := rtl8393
   DEVICE_MODEL := DGS-1210-52
 endef




More information about the lede-commits mailing list