[kirkwood] bump to 2.6.30-rc5

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

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index c964567..929755f 100644 (file)
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -52,9 +52,8 @@ define Image/Build/AP81
                ( \
                        dd if=$(KDIR)/vmlinux-$(2).uImage bs=768k conv=sync; \
                        dd if=$(KDIR)/root.$(1) bs=3008k conv=sync; \
                ( \
                        dd if=$(KDIR)/vmlinux-$(2).uImage bs=768k conv=sync; \
                        dd if=$(KDIR)/root.$(1) bs=3008k conv=sync; \

-               ) > $(call imgname,$(1),$(2)).bin; \
-               cp $(call imgname,$(1),$(2)).bin $(call imgname,$(1),$(2)).webui; \
-               echo -n $(4) >> $(call imgname,$(1),$(2)).webui; \
+                       echo -n $(4); \
+               ) > $(call imgname,$(1),$(2)).uni; \

        fi; fi
 endef
 
        fi; fi
 endef
 


@@ -74,7 +73,7 @@ define Image/Build/UBNT
                -B $(4) -v $(5).ar7100.OpenWrt.$(REVISION) \
                -k $(KDIR)/vmlinux-$(2).bin.lzma \
                -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
                -B $(4) -v $(5).ar7100.OpenWrt.$(REVISION) \
                -k $(KDIR)/vmlinux-$(2).bin.lzma \
                -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \

-               -o $(BIN_DIR)/openwrt-$(BOARD)-ubnt-$(2)-$(1).bin
+               -o $(BIN_DIR)/openwrt-$(BOARD)-$(2)-$(1).bin

 endef
 
 define Image/Build/Planex
 endef
 
 define Image/Build/Planex


@@ -108,7 +107,7 @@ define Image/Build/TPLINK
                -B $(4) -N OpenWrt -V $(REVISION)\
                -k $(KDIR)/vmlinux-$(2).bin.gzip \
                -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
                -B $(4) -N OpenWrt -V $(REVISION)\
                -k $(KDIR)/vmlinux-$(2).bin.gzip \
                -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \

-               -o $(BIN_DIR)/openwrt-$(BOARD)-$(2)-$(1).bin
+               -o $(BIN_DIR)/openwrt-$(BOARD)-$(2)-$(1).uni

 endef
 
 define Image/Build/Template/Compex
 endef
 
 define Image/Build/Template/Compex


@@ -167,18 +166,48 @@ define Image/Build/Profile/TEW652BRP
        $(call Image/Build/Template/AP81/$(1),tew-652brp,board=TEW-632BRP,"AP81-AR9130-RT-080609-05")
 endef
 
        $(call Image/Build/Template/AP81/$(1),tew-652brp,board=TEW-632BRP,"AP81-AR9130-RT-080609-05")
 endef
 

+define Image/Build/Profile/A02RBW300N
+       $(call Image/Build/Template/AP81/$(1),a02-rb-w300n,board=TEW-632BRP,"AP81-AR9130-RT-070614-03")
+endef
+

 define Image/Build/Profile/UBNTRS
 define Image/Build/Profile/UBNTRS

-       $(call Image/Build/Template/UBNT/$(1),rs,board=UBNT-RS,RS,RSx)
+       $(call Image/Build/Template/UBNT/$(1),ubnt-rs,board=UBNT-RS,RS,RSx)
+endef
+
+define Image/Build/Profile/UBNTLSSR71
+       $(call Image/Build/Template/UBNT/$(1),ubnt-ls-sr71,board=UBNT-LS-SR71,LS-SR71,LS-SR71)

 endef
 
 define Image/Build/Profile/MZKW04NU
        $(call Image/Build/Template/Planex/$(1),mzk-w04nu,board=MZK-W04NU)
 endef
 
 endef
 
 define Image/Build/Profile/MZKW04NU
        $(call Image/Build/Template/Planex/$(1),mzk-w04nu,board=MZK-W04NU)
 endef
 

+define Image/Build/Profile/TLWR841NDV3
+       $(call Image/Build/Template/TPLINK/$(1),tl-wr841ndv3,board=TL-WR941ND,TL-WR841NDv3)
+endef
+

 define Image/Build/Profile/TLWR941NDV2
        $(call Image/Build/Template/TPLINK/$(1),tl-wr941ndv2,board=TL-WR941ND,TL-WR941NDv2)
 endef
 
 define Image/Build/Profile/TLWR941NDV2
        $(call Image/Build/Template/TPLINK/$(1),tl-wr941ndv2,board=TL-WR941ND,TL-WR941NDv2)
 endef
 

+define Image/Build/Profile/Default
+       $(call Image/Build/Profile/A02RBW300N,$(1))
+       $(call Image/Build/Profile/DIR615C1,$(1))
+       $(call Image/Build/Profile/MZKW04NU,$(1))
+       $(call Image/Build/Profile/TEW632BRP,$(1))
+       $(call Image/Build/Profile/TEW652BRP,$(1))
+       $(call Image/Build/Profile/TLWR841NDV3,$(1))
+       $(call Image/Build/Profile/TLWR941NDV2,$(1))
+       $(call Image/Build/Profile/UBNTRS,$(1))
+       $(call Image/Build/Profile/UBNTLSSR71,$(1))
+       $(call Image/Build/Profile/WP543,$(1))
+endef
+
+define Image/Build/Profile/Madwifi
+       $(call Image/Build/Profile/UBNTRS,$(1))
+       $(call Image/Build/Profile/WP543,$(1))
+endef
+

 define Image/Build/squashfs
        $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
 endef
 define Image/Build/squashfs
        $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
 endef


@@ -187,13 +216,7 @@ define Image/Build
        $(call Image/Build/$(1))
        dd if=$(KDIR)/root.$(1) of=$(IMGNAME)-root.$(1) bs=128k conv=sync
 
        $(call Image/Build/$(1))
        dd if=$(KDIR)/root.$(1) of=$(IMGNAME)-root.$(1) bs=128k conv=sync
 

-       $(call Image/Build/Profile/DIR615C1,$(1))
-       $(call Image/Build/Profile/MZKW04NU,$(1))
-       $(call Image/Build/Profile/TEW632BRP,$(1))
-       $(call Image/Build/Profile/TEW652BRP,$(1))
-       $(call Image/Build/Profile/UBNTRS,$(1))
-       $(call Image/Build/Profile/WP543,$(1))
-       $(call Image/Build/Profile/TLWR941NDV2,$(1))
+       $(call Image/Build/Profile/$(PROFILE),$(1))

 endef
 
 $(eval $(call BuildImage))
 endef
 
 $(eval $(call BuildImage))