From: Sungbo Eo <mans0n@gorani.run>
Date: Fri, 29 May 2020 11:49:44 +0000 (+0900)
Subject: mediatek: tidy up image subtarget Makefiles
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3559b46b626af792d8b9c41f4f2fdae5dd6c3720;p=openwrt%2Fstaging%2Fdangole.git

mediatek: tidy up image subtarget Makefiles

- sort device recipes alphabetically
- adjust board name of ELECOM WRC-2533GENT
- harmonize line wrapping

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
[rebased]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk
index b570ce9d82..bb7d89a826 100644
--- a/target/linux/mediatek/image/mt7622.mk
+++ b/target/linux/mediatek/image/mt7622.mk
@@ -1,14 +1,5 @@
 KERNEL_LOADADDR := 0x41080000
 
-define Device/mediatek_mt7622-rfb1
-  DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := MTK7622 rfb1 AP
-  DEVICE_DTS := mt7622-rfb1
-  DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-  DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb3 kmod-ata-ahci-mtk
-endef
-TARGET_DEVICES += mediatek_mt7622-rfb1
-
 define Device/bpi_bananapi-r64
   DEVICE_VENDOR := Bpi
   DEVICE_MODEL := Banana Pi R64
@@ -19,14 +10,21 @@ define Device/bpi_bananapi-r64
 endef
 TARGET_DEVICES += bpi_bananapi-r64
 
-define Device/elecom-wrc-2533gent
+define Device/elecom_wrc-2533gent
   DEVICE_VENDOR := Elecom
   DEVICE_MODEL := WRC-2533GENT
   DEVICE_DTS := mt7622-elecom-wrc-2533gent
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-  DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb3 \
-                     kmod-mt7615e kmod-mt7615-firmware \
-                     mt7622bt-firmware swconfig
-  SUPPORTED_DEVICES := elecom,wrc-2533gent
+  DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb3 kmod-mt7615e \
+	kmod-mt7615-firmware mt7622bt-firmware swconfig
 endef
-TARGET_DEVICES += elecom-wrc-2533gent
+TARGET_DEVICES += elecom_wrc-2533gent
+
+define Device/mediatek_mt7622-rfb1
+  DEVICE_VENDOR := MediaTek
+  DEVICE_MODEL := MTK7622 rfb1 AP
+  DEVICE_DTS := mt7622-rfb1
+  DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
+  DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb3 kmod-ata-ahci-mtk
+endef
+TARGET_DEVICES += mediatek_mt7622-rfb1
diff --git a/target/linux/mediatek/image/mt7623.mk b/target/linux/mediatek/image/mt7623.mk
index a4a9fff2b7..4514719c1d 100644
--- a/target/linux/mediatek/image/mt7623.mk
+++ b/target/linux/mediatek/image/mt7623.mk
@@ -1,20 +1,21 @@
 KERNEL_LOADADDR := 0x80008000
 
+define Device/bpi_bananapi-r2
+  DEVICE_VENDOR := Bpi
+  DEVICE_MODEL := Banana Pi R2
+  DEVICE_DTS := mt7623n-bananapi-bpi-r2
+  SUPPORTED_DEVICES := bananapi,bpi-r2
+endef
+TARGET_DEVICES += bpi_bananapi-r2
+
 define Device/unielec_u7623-02-emmc-512m
   DEVICE_VENDOR := UniElec
   DEVICE_MODEL := U7623-02
   DEVICE_VARIANT := eMMC/512MB RAM
   DEVICE_DTS := mt7623a-unielec-u7623-02-emmc-512m
-  DEVICE_PACKAGES := mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 kmod-mmc
+  DEVICE_PACKAGES := kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 kmod-mmc \
+	mkf2fs e2fsprogs
   IMAGES := sysupgrade-emmc.bin.gz
   IMAGE/sysupgrade-emmc.bin.gz := sysupgrade-emmc | gzip | append-metadata
 endef
 TARGET_DEVICES += unielec_u7623-02-emmc-512m
-
-define Device/bpi_bananapi-r2
-  DEVICE_VENDOR := Bpi
-  DEVICE_MODEL := Banana Pi R2
-  DEVICE_DTS := mt7623n-bananapi-bpi-r2
-  SUPPORTED_DEVICES := bananapi,bpi-r2
-endef
-TARGET_DEVICES += bpi_bananapi-r2