From ee76a07fbf05e17062b800cfc831d04ea39df572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Tue, 8 Mar 2016 18:33:25 +0000
Subject: [PATCH] brcm47xx: image: switch Netgear WGT634U to the new building
 system
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 48973
---
 target/linux/brcm47xx/image/Makefile | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/target/linux/brcm47xx/image/Makefile b/target/linux/brcm47xx/image/Makefile
index 731bef349b..aeeb147986 100644
--- a/target/linux/brcm47xx/image/Makefile
+++ b/target/linux/brcm47xx/image/Makefile
@@ -34,11 +34,6 @@ endif
 	$(call prepare_generic_squashfs,$(KDIR)/fs_mark)
 endef
 
-define Image/Build/wgt634u
-	dd if=$(KDIR)/loader.elf of=$(BIN_DIR)/$(IMG_PREFIX)-wgt634u-$(2).bin bs=131072 conv=sync
-	cat $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx >> $(BIN_DIR)/$(IMG_PREFIX)-wgt634u-$(2).bin
-endef
-
 # $(1): filesystem type.
 # $(2): device model (used for output file).
 # $(3): pattern (device specific magic).
@@ -133,6 +128,12 @@ define Build/motorola-bin
 	mv $@.new $@
 endef
 
+define Build/prepend-with-elf
+	mv $@ $@.old
+	dd if=$(KDIR)/loader.elf of=$@ bs=131072 conv=sync
+	cat $@.old >> $@
+endef
+
 define Build/tailed-bin
 	echo $(BIN_TAIL) >> $@
 endef
@@ -238,7 +239,6 @@ endif
 # $(1): filesystem type.
 define Image/Build/legacy/devices-with-128k-blocks
 	$(call Image/Build/trxV2,$(1),wrt54g3gv2-vf,3G2V,3.00.24,$(patsubst jffs2-%,jffs2,$(1)),6)
-	$(call Image/Build/wgt634u,$(1),$(patsubst jffs2-%,jffs2,$(1)))
 endef
 
 # $(1): filesystem type.
@@ -282,6 +282,12 @@ define Device/linksys-wrtsl54gs
 	VERSION := 2.08.1
 endef
 
+define Device/netgear-wgt634u
+	FILESYSTEMS := $(FS_128K)
+	IMAGES := bin
+	IMAGE/bin := trx-with-loader | prepend-with-elf
+endef
+
 define Device/usrobotics-usr5461
 	IMAGES := bin
 	IMAGE/bin := trx-with-loader | usrobotics-bin
@@ -294,6 +300,7 @@ ifeq ($(SUBTARGET),legacy)
 	huawei-e970 \
 	linksys-wrt54gs \
 	linksys-wrtsl54gs \
+	netgear-wgt634u \
 	usrobotics-usr5461
 
   $(eval $(call AsusDevice,wl-300g,WL300g      ))
-- 
GitLab