From e40d4842d5c09820c88fa77bacdc02ac7044fb47 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Sat, 11 Nov 2017 02:59:35 +0100
Subject: [PATCH] ar71xx/image: migrate OpenMesh A60 to new image builder code

---
 target/linux/ar71xx/image/generic.mk        | 26 +++++++++++++++++++++
 target/linux/ar71xx/image/legacy-devices.mk |  7 ------
 target/linux/ar71xx/image/legacy.mk         |  1 -
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk
index 3c5fcc3f3c..1191953fff 100644
--- a/target/linux/ar71xx/image/generic.mk
+++ b/target/linux/ar71xx/image/generic.mk
@@ -74,6 +74,32 @@ define Build/wrgg-pad-rootfs
 	$(STAGING_DIR_HOST)/bin/padjffs2 $(IMAGE_ROOTFS) -c 64 >>$@
 endef
 
+define Build/mkopenmesh
+	# <type> <out file path> <kernel path> <rootfs path>
+	$(TOPDIR)/scripts/om-fwupgradecfg-gen.sh \
+		"$(BOARDNAME)" \
+		"$@-cfg"
+		"$(IMAGE_KERNEL)" \
+		"$@"
+	# <boardname> <ext filename> <file1> <filename1> [<file2> <filename2> <fileN> <filenameN>]"
+	$(TOPDIR)/scripts/combined-ext-image.sh \
+		"$(BOARDNAME)" "$@.out"
+		"$@-cfg" "fwupgrade.cfg" \
+		"$(IMAGE_KERNEL)" "kernel" \
+		"$@" "rootfs"
+	rm "$@-cfg"
+	mv "$@.out" "$@"
+endef
+
+define Device/a60
+  DEVICE_TITLE := OpenMesh A40/A60
+  DEVICE_PACKAGES := om-watchdog kmod-ath10k ath10k-firmware-qca988x \
+	kmod-usb-core kmod-usb2
+  BOARDNAME := A60
+  SUPPORTED_DEVICES := a60
+  IMAGE/sysupgrade.bin = append-rootfs | mkopenmesh
+endef
+TARGET_DEVICES += a60
 
 define Device/ap121f
   DEVICE_TITLE := ALFA Network AP121F
diff --git a/target/linux/ar71xx/image/legacy-devices.mk b/target/linux/ar71xx/image/legacy-devices.mk
index e418282dd0..a23c95307c 100644
--- a/target/linux/ar71xx/image/legacy-devices.mk
+++ b/target/linux/ar71xx/image/legacy-devices.mk
@@ -1,10 +1,3 @@
-define LegacyDevice/A60
-   DEVICE_TITLE := OpenMesh A40/A60
-   DEVICE_PACKAGES := om-watchdog kmod-ath10k ath10k-firmware-qca988x \
-	mod-usb-core kmod-usb2
-endef
-LEGACY_DEVICES += A60
-
 define LegacyDevice/ALFANX
   DEVICE_TITLE := ALFA Network N2/N5 board
 endef
diff --git a/target/linux/ar71xx/image/legacy.mk b/target/linux/ar71xx/image/legacy.mk
index 701116be43..dd76bcd09b 100644
--- a/target/linux/ar71xx/image/legacy.mk
+++ b/target/linux/ar71xx/image/legacy.mk
@@ -965,7 +965,6 @@ $(eval $(call SingleProfile,Netgear,64kraw,REALWNR1000V2,wnr1000v2,WNR1000V2,tty
 $(eval $(call SingleProfile,Netgear,64kraw,WNR1000V2_VC,wnr1000v2-vc,WNR1000V2,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x31303030,WNR1000V2-VC,"",))
 $(eval $(call SingleProfile,Netgear,64kraw,WPN824N,wpn824n,WPN824N,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x31313030,WPN824N,"" NA,))
 
-$(eval $(call SingleProfile,OpenMesh,squashfs-only,A60,a60,,,,A60))
 $(eval $(call SingleProfile,OpenMesh,squashfs-only,OM2P,om2p,,,,OM2P))
 $(eval $(call SingleProfile,OpenMesh,squashfs-only,OM5P,om5p,,,,OM5P))
 $(eval $(call SingleProfile,OpenMesh,squashfs-only,OM5PAC,om5pac,,,,OM5PAC))
-- 
2.30.2