From cb618e5c95086380e6708f80c3d2d15f6d8bb3f5 Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 24 Jan 2012 09:47:22 +0000
Subject: ar71xx: prebuild all loaders in Image/Prepare stage

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29878 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/ar71xx/image/Makefile | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'target/linux')

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index be68f9f1f9..fb903a5227 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -321,8 +321,11 @@ define Image/Build/ALFA
 	fi
 endef
 
+define Image/Build/TPLINKOLD/loader
+	$(call Image/BuildLoaderAlone,$(1),gz,$(2),0x22000,0)
+endef
+
 define Image/Build/TPLINKOLD
-	$(call Image/BuildLoaderAlone,$(2),gz,$(3),0x22000,0)
 	$(call MkuImageOKLI,$(2))
 	( \
 		dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \
@@ -348,8 +351,11 @@ define Image/Build/TPLINKOLD/initramfs
 		-o $(call imgname,$(1),$(2))-uImage.bin
 endef
 
+define Image/Build/TPLINK/loader
+	$(call Image/BuildLoaderAlone,$(1),gz,$(2),0x22000,0)
+endef
+
 define Image/Build/TPLINK
-	$(call Image/BuildLoaderAlone,$(2),gz,$(3),0x22000,0)
 	$(call MkuImageOKLI,$(2))
 	( \
 		dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \
@@ -555,6 +561,10 @@ define Image/Build/Template/all/jffs2-128k
 	$(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
+define Image/Build/Template/squashfs-only/loader
+	$(call Image/Build/$(1)/loader,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
+endef
+
 define Image/Build/Template/squashfs-only/squashfs
 	$(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
@@ -567,6 +577,10 @@ define Image/Build/Template/64k/jffs2-64k
 	$(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
+define Image/Build/Template/64kraw/loader
+	$(call Image/Build/$(1)/loader,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
+endef
+
 define Image/Build/Template/64kraw/squashfs
 	$(call Image/Build/$(1),squashfs-raw,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
@@ -1018,6 +1032,10 @@ define Image/Build/Initramfs
 	$(call Image/Build/Profile/$(PROFILE),initramfs)
 endef
 
+define Image/Prepare
+	$(call Image/Build/Profile/Default,loader)
+endef
+
 define Image/Build
 	$(call Image/Build/$(1))
 	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
-- 
cgit v1.2.3