From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Fri, 25 Sep 2020 18:04:54 +0000 (+0200)
Subject: ath79: move engenius_loader_okli recipe before devices
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b284333b3a25f8a33b98c287256d6c0ee53250f7;p=openwrt%2Fstaging%2Fneocturne.git

ath79: move engenius_loader_okli recipe before devices

Move engenius_loader_okli image recipe in front of all Engenius
devices, so adding new device entries will not have them sorted
before the shared recipe.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index 7e5b09af2b..3f3a65105a 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -152,6 +152,7 @@ define Build/wrgg-pad-rootfs
 	$(STAGING_DIR_HOST)/bin/padjffs2 $(IMAGE_ROOTFS) -c 64 >>$@
 endef
 
+
 define Device/seama
   KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma
   KERNEL_INITRAMFS := $$(KERNEL) | seama
@@ -799,20 +800,6 @@ define Device/embeddedwireless_dorin
 endef
 TARGET_DEVICES += embeddedwireless_dorin
 
-define Device/engenius_ecb1750
-  SOC := qca9558
-  DEVICE_VENDOR := EnGenius
-  DEVICE_MODEL := ECB1750
-  DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
-  IMAGE_SIZE := 15680k
-  IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \
-	append-rootfs | pad-rootfs | check-size | \
-	senao-header -r 0x101 -p 0x6d -t 2
-  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \
-	append-metadata | check-size
-endef
-TARGET_DEVICES += engenius_ecb1750
-
 define Device/engenius_loader_okli
   DEVICE_VENDOR := EnGenius
   KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49
@@ -827,6 +814,20 @@ define Device/engenius_loader_okli
 	check-size | engenius-tar-gz $$$$(ENGENIUS_IMGNAME)
 endef
 
+define Device/engenius_ecb1750
+  SOC := qca9558
+  DEVICE_VENDOR := EnGenius
+  DEVICE_MODEL := ECB1750
+  DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
+  IMAGE_SIZE := 15680k
+  IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \
+	append-rootfs | pad-rootfs | check-size | \
+	senao-header -r 0x101 -p 0x6d -t 2
+  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \
+	append-metadata | check-size
+endef
+TARGET_DEVICES += engenius_ecb1750
+
 define Device/engenius_enh202-v1
   $(Device/engenius_loader_okli)
   SOC := ar7240