fix grub image target dependency

[openwrt.git] / target / linux / brcm63xx / image / Makefile

diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 310b3bf..af15c1b 100644 (file)
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -17,8 +17,6 @@ LOADER_MAKEOPTS= \
                KERNEL_ENTRY=$(KERNEL_ENTRY) \
                RAMSIZE=$(RAMSIZE)
 
-SVN_REVISION=r$(shell svn info|grep Revision|cut -f1 -d\ )
-
 define trxalign/jffs2-128k
 -a 0x20000
 endef
@@ -96,14 +94,13 @@ define Image/Prepare
 endef
 
 define Image/Build
-       $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD)-$(1).trx -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma $(call trxalign/$(1)) -f $(KDIR)/root.$(1)
        dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-root.$(1) bs=128k conv=sync
        # Various routers
        $(call Image/Build/CFE,$(1),96345GW2,6345,bccfe,,bccfe,)
        $(call Image/Build/CFE,$(1),96345GW2,6345,bc221,,bc221,-y 5)
        $(call Image/Build/CFE,$(1),96345GW2,6345,bc300,,bc300,)
-       $(call Image/Build/CFE,$(1),96345GW2,6345,bc310,OpenWRT-$(SVN_REVISION),bc310,)
-       $(call Image/Build/CFE,$(1),96348GW,6348,bccfe,,bcfe,)
+       $(call Image/Build/CFE,$(1),96345GW2,6345,bc310,OpenWRT-$(REVISION),bc310,)
+       $(call Image/Build/CFE,$(1),96348GW,6348,bccfe,,bccfe,)
        $(call Image/Build/CFE,$(1),96348GW,6348,bc221,,bc221,-y 5)
        # BT Voyager V210_BTR
        $(call Image/Build/CFE,$(1),V210_BB,6348,bc221,,btvgr,-y 5)
@@ -119,13 +116,15 @@ define Image/Build
        $(call Image/Build/CFE,$(1),V2110,6348,bc221,,btvgr,-y 5)
        # BT Voyager V2500V, V2500V_SIP_CLUB, V2500V_AA
        $(call Image/Build/CFE,$(1),V2500V_BB,6348,bc221,,btvgr,-y 5)
+       # RTA1025W_16 (numerous routers)
+       $(call Image/Build/CFE,$(1),RTA1025W_16,6348,bc221,,btrta,-y 5)
        # Tecom GW6000
        $(call Image/Build/CFE,$(1),96348GW,6348,bc300,,bc300,)
        # Tecom GW6200
        $(call Image/Build/CFE,$(1),96348GW,6348,bc310,$(shell printf '\x99'),gw6200)
        # Neufbox4
        $(call Image/Build/CFE,$(1),96358VW,6358,bccfe,,bccfe)
-       $(call Image/Build/CFE,$(1),96358VW,6358,bc310,OpenWRT-$(SVN_REVISION),nb4)
+       $(call Image/Build/CFE,$(1),96358VW,6358,bc310,OpenWRT-$(REVISION),nb4)
        # Comtrend 536, 5621
        $(call Image/Build/CFE,$(1),96348GW-11,6348,bccfe,,bccfe)
        $(call Image/Build/CFE,$(1),96348GW-11,6348,bc300,,bc300)
@@ -145,12 +144,23 @@ define Image/Build
        $(call Image/Build/CFE,$(1),D-4P-W,6348,bc310,,bc310)
 
        # TP-Link TD-8810A, TD-8810B, TD-8811A, TD-8811B
+       $(call Image/Build/CFE,$(1),8L-2M-8M,6338,bccfe,,bccfe)
        $(call Image/Build/CFE,$(1),8L-2M-8M,6338,bc300,,bc300)
 
+       # Generic 6338 images
+       $(call Image/Build/CFE,$(1),6338GW,6338,bccfe,,bccfe)
+       $(call Image/Build/CFE,$(1),6338GW,6338,bc221,,bc221)
+       $(call Image/Build/CFE,$(1),6338GW,6338,bc300,,bc300)
+       $(call Image/Build/CFE,$(1),6338GW,6338,bc310,,bc310)
+       $(call Image/Build/CFE,$(1),6338W,6338,bccfe,,bccfe)
+       $(call Image/Build/CFE,$(1),6338W,6338,bc221,,bc221)
+       $(call Image/Build/CFE,$(1),6338W,6338,bc300,,bc300)
+       $(call Image/Build/CFE,$(1),6338W,6338,bc310,,bc310)
+
        # Sagem F@ST2404
        $(call Image/Build/CFE,$(1),F@ST2404,6348,bccfe,,bccfe)
        $(call Image/Build/CFE,$(1),F@ST2404,6348,bc300,,bc300)
-       $(call Image/Build/CFE,$(1),F@ST2404,6348,bc310,OpenWRT-$(SVN_REVISION),bc310)
+       $(call Image/Build/CFE,$(1),F@ST2404,6348,bc310,OpenWRT-$(REVISION),bc310)
        # Inventel Livebox
        $(call Image/Build/RedBoot,livebox)
        # D-Link DSL-2740B
@@ -158,6 +168,9 @@ define Image/Build
        # Pirelli Alice Gate VoIP 2 Plus Wi-Fi AGPF-S0
        $(call Image/Build/CFEAGPF,$(1),AGPF-S0,6358,0x20000,bccfe,,bccfe)
        $(call Image/Build/CFEAGPF,$(1),AGPF-S0,6358,0x20000,ag306,,agv2+w)
+       # Pirelli A226G
+       $(call Image/Build/CFEAGPF,$(1),DWV-S0,6358,0x10000,bccfe,,bccfe)
+       $(call Image/Build/CFEAGPF,$(1),DWV-S0,6358,0x10000,ag306,DWV_96358,a226g)
 endef
 
 $(eval $(call BuildImage))