projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
resync 2.6.31 patches
[openwrt.git] / target / linux / ar71xx / image / Makefile
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index f182f79..816f27e 100644 (file)
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/image.mk
 IMGNAME:=$(BIN_DIR)/openwrt-$(BOARD)
 
 define imgname
-$(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(1))
+$(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))
 endef
 
 VMLINUX:=$(IMGNAME)-vmlinux
@@ -36,13 +36,35 @@ define Image/BuildKernel
                -d $(KDIR)/vmlinux.bin.lzma $(IMGNAME)-uImage-lzma.bin
 endef
 
+define Image/Build/WRT400N
+       cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(2)
+       $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(2) '$(strip $(3))'
+       $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux-$(2) $(KDIR)/vmlinux-$(2).bin.lzma
+       if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 1310720 ]; then \
+               echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
+       else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 6488064 ]; then \
+               echo "Warning: $(KDIR)/root.$(1) is too big"; \
+       else \
+               mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
+                       0x80060000 \
+                       -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
+                       -d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
+               ( \
+                       dd if=$(KDIR)/vmlinux-$(2).uImage bs=1280k conv=sync; \
+                       dd if=$(KDIR)/root.$(1) bs=6336k conv=sync; \
+                       echo -n $(4); \
+               ) > $(call imgname,$(1),$(2)).bin; \
+               wrt400n $(KDIR)/vmlinux-$(2).uImage $(KDIR)/root.$(1) $(call imgname,$(1),$(2)).webui; \
+       fi; fi
+endef
+
 define Image/Build/AP81
        cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(2)
        $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(2) '$(strip $(3))'
        $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux-$(2) $(KDIR)/vmlinux-$(2).bin.lzma
-       if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 786432 ]; then \
+       if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 851968 ]; then \
                echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
-       else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 3080192 ]; then \
+       else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 3014656 ]; then \
                echo "Warning: $(KDIR)/root.$(1) is too big"; \
        else \
                mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
@@ -50,16 +72,41 @@ define Image/Build/AP81
                        -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
                        -d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
                ( \
-                       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=832k conv=sync; \
+                       dd if=$(KDIR)/root.$(1) bs=2944k conv=sync; \
                        echo -n $(4); \
                ) > $(call imgname,$(1),$(2)).uni; \
        fi; fi
 endef
 
+define Image/Build/AP83
+       cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(2)
+       $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(2) '$(strip $(3))'
+       gzip -9 -c $(KDIR)/vmlinux-$(2) > $(KDIR)/vmlinux-$(2).bin.gz
+       if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.gz"` -gt 1310720 ]; then \
+               echo "Warning: $(KDIR)/vmlinux-$(2).bin.gz is too big"; \
+       else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 6619136 ]; then \
+               echo "Warning: $(KDIR)/root.$(1) is too big"; \
+       else \
+               mkimage -A mips -O linux -T kernel -a 0x80060000 -C gzip -e \
+                       0x80060000 \
+                       -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
+                       -d $(KDIR)/vmlinux-$(2).bin.gz \
+                       $(KDIR)/vmlinux-$(2).uImage; \
+               dd if=$(KDIR)/vmlinux-$(2).uImage \
+                       of=$(call imgname,kernel,$(2)).bin bs=64k conv=sync; \
+               dd if=$(KDIR)/root.$(1) \
+                       of=$(call imgname,$(1),$(2)-rootfs).bin bs=128k conv=sync; \
+               ( \
+                       dd if=$(KDIR)/vmlinux-$(2).uImage bs=1280k conv=sync; \
+                       dd if=$(KDIR)/root.$(1); \
+               ) > $(call imgname,$(1),$(2)-firmware).bin; \
+       fi; fi
+endef
+
 define Image/Build/MyLoader
        -$(STAGING_DIR_HOST)/bin/mkmylofw -B $(2) \
-               -p0x30000:0xc0000:ahl:0x80060000:kernel:$(KDIR)/vmlinux.bin.lzma  \
+               -p0x30000:0xc0000:al:0x80060000:kernel:$(KDIR)/vmlinux.bin.lzma  \
                -p0xf0000:0:::rootfs:$(KDIR)/root.$(1) \
                $(call imgname,$(1),$(2)).img
 endef
@@ -70,10 +117,10 @@ define Image/Build/UBNT
        $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux-$(2) $(KDIR)/vmlinux-$(2).lzma
        dd if=$(KDIR)/vmlinux-$(2).lzma of=$(KDIR)/vmlinux-$(2).bin.lzma bs=64k conv=sync
        -$(STAGING_DIR_HOST)/bin/mkfwimage \
-               -B $(4) -v $(5).ar7100.OpenWrt.$(REVISION) \
+               -B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \
                -k $(KDIR)/vmlinux-$(2).bin.lzma \
                -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
-               -o $(BIN_DIR)/openwrt-$(BOARD)-$(2)-$(1).bin
+               -o $(call imgname,$(1),$(2)).bin
 endef
 
 define Image/Build/Planex
@@ -93,7 +140,9 @@ define Image/Build/Planex
                        dd if=$(KDIR)/vmlinux-$(2).uImage bs=1408k conv=sync; \
                        dd if=$(KDIR)/root.$(1) bs=6208k conv=sync; \
                ) > $(call imgname,$(1),$(2)).bin; \
-               $(STAGING_DIR_HOST)/bin/mkplanexfw -v 2.00.00 \
+               $(STAGING_DIR_HOST)/bin/mkplanexfw \
+                       -B $(2) \
+                       -v 2.00.00 \
                        -i $(call imgname,$(1),$(2)).bin \
                        -o $(call imgname,$(1),$(2)).webui; \
        fi; fi
@@ -107,7 +156,27 @@ define Image/Build/TPLINK
                -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).uni
+               -o $(call imgname,$(1),$(2)).uni
+endef
+
+define Image/Build/CyberTAN
+       cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(2)
+       $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(2) '$(strip $(3))'
+       gzip -9 -c $(KDIR)/vmlinux-$(2) > $(KDIR)/vmlinux-$(2).bin.gzip
+       mkimage -A mips -O linux -T kernel -a 0x80060000 -C gzip -e \
+               0x80060000 \
+               -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
+               -d $(KDIR)/vmlinux-$(2).bin.gzip $(KDIR)/vmlinux-$(2).uImage
+       ( \
+               dd if=$(KDIR)/vmlinux-$(2).uImage bs=64k conv=sync; \
+               dd if=/dev/zero bs=1 count=65476; \
+               dd if=$(KDIR)/root.$(1) bs=64k; \
+       ) > $(KDIR)/vmlinux-$(2).image
+       $(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/vmlinux-$(2).trx \
+               -f $(KDIR)/vmlinux-$(2).image
+       -$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(4) -g \
+               -i $(KDIR)/vmlinux-$(2).trx \
+               -o $(call imgname,$(1),$(2)).bin
 endef
 
 define Image/Build/Template/Compex
@@ -118,6 +187,30 @@ define Image/Build/Template/Compex/squashfs
        $(call Image/Build/Template/Compex,squashfs,$(1))
 endef
 
+define Image/Build/Template/WRT400N
+       $(call Image/Build/WRT400N,$(1),$(2),$(3),$(4))
+endef
+
+define Image/Build/Template/WRT400N/squashfs
+       $(call Image/Build/Template/WRT400N,squashfs,$(1),$(2),$(3))
+endef
+
+define Image/Build/Template/WRT400N/jffs2-64k
+       $(call Image/Build/Template/WRT400N,jffs2-64k,$(1),$(2),$(3))
+endef
+
+define Image/Build/Template/CyberTAN
+       $(call Image/Build/CyberTAN,$(1),$(2),$(3),$(4))
+endef
+
+define Image/Build/Template/CyberTAN/squashfs
+       $(call Image/Build/Template/CyberTAN,squashfs,$(1),$(2),$(3))
+endef
+
+define Image/Build/Template/CyberTAN/jffs2-64k
+       $(call Image/Build/Template/CyberTAN,jffs2-64k,$(1),$(2),$(3))
+endef
+
 define Image/Build/Template/AP81
        $(call Image/Build/AP81,$(1),$(2),$(3),$(4))
 endef
@@ -126,6 +219,18 @@ define Image/Build/Template/AP81/squashfs
        $(call Image/Build/Template/AP81,squashfs,$(1),$(2),$(3))
 endef
 
+define Image/Build/Template/AP83
+       $(call Image/Build/AP83,$(1),$(2),$(3))
+endef
+
+define Image/Build/Template/AP83/squashfs
+       $(call Image/Build/Template/AP83,squashfs,$(1),$(2))
+endef
+
+define Image/Build/Template/AP83/jffs2-64k
+       $(call Image/Build/Template/AP83,jffs2-64k,$(1),$(2))
+endef
+
 define Image/Build/Template/TPLINK
        $(call Image/Build/TPLINK,$(1),$(2),$(3),$(4))
 endef
@@ -134,12 +239,24 @@ define Image/Build/Template/TPLINK/squashfs
        $(call Image/Build/Template/TPLINK,squashfs,$(1),$(2),$(3))
 endef
 
+define Image/Build/Template/TPLINK4K
+       $(call Image/Build/TPLINK,$(1),$(2),$(3),$(4))
+endef
+
+define Image/Build/Template/TPLINK4K/squashfs
+       $(call Image/Build/Template/TPLINK,squashfs-4k,$(1),$(2),$(3))
+endef
+
 define Image/Build/Template/UBNT
-       $(call Image/Build/UBNT,$(1),$(2),$(3),$(4),$(5))
+       $(call Image/Build/UBNT,$(1),$(2),$(3),$(4),$(5),$(6))
 endef
 
 define Image/Build/Template/UBNT/squashfs
-       $(call Image/Build/Template/UBNT,squashfs,$(1),$(2),$(3),$(4))
+       $(call Image/Build/Template/UBNT,squashfs,$(1),$(2),$(3),$(4),$(5))
+endef
+
+define Image/Build/Template/UBNT/jffs2-64k
+       $(call Image/Build/Template/UBNT,jffs2-64k,$(1),$(2),$(3),$(4),$(5))
 endef
 
 define Image/Build/Template/Planex
@@ -150,6 +267,14 @@ define Image/Build/Template/Planex/squashfs
        $(call Image/Build/Template/Planex,squashfs,$(1),$(2))
 endef
 
+define Image/Build/Template/Planex/jffs2-64k
+       $(call Image/Build/Template/Planex,jffs2-64k,$(1),$(2))
+endef
+
+define Image/Build/Profile/AP83
+       $(call Image/Build/Template/AP83/$(1),ap83,board=AP83)
+endef
+
 define Image/Build/Profile/WP543
        $(call Image/Build/Template/Compex/$(1),wp543)
 endef
@@ -171,39 +296,76 @@ define Image/Build/Profile/A02RBW300N
 endef
 
 define Image/Build/Profile/UBNTRS
-       $(call Image/Build/Template/UBNT/$(1),ubnt-rs,board=UBNT-RS,RS,RSx)
+       $(call Image/Build/Template/UBNT/$(1),ubnt-rs,board=UBNT-RS,RS,RSx,ar7100)
+endef
+
+define Image/Build/Profile/UBNTRSPRO
+       $(call Image/Build/Template/UBNT/$(1),ubnt-rspro,board=UBNT-RSPRO,RSPRO,RSPRO,ar7100pro)
 endef
 
 define Image/Build/Profile/UBNTLSSR71
-       $(call Image/Build/Template/UBNT/$(1),ubnt-ls-sr71,board=UBNT-LS-SR71,LS-SR71,LS-SR71)
+       $(call Image/Build/Template/UBNT/$(1),ubnt-ls-sr71,board=UBNT-LS-SR71,LS-SR71,LS-SR71,ar7100)
+endef
+
+define Image/Build/Profile/UBNT
+       $(call Image/Build/Profile/UBNTRS,$(1))
+       $(call Image/Build/Profile/UBNTRSPRO,$(1))
+       $(call Image/Build/Profile/UBNTLSSR71,$(1))
 endef
 
 define Image/Build/Profile/MZKW04NU
        $(call Image/Build/Template/Planex/$(1),mzk-w04nu,board=MZK-W04NU)
 endef
 
+define Image/Build/Profile/MZKW300NH
+       $(call Image/Build/Template/Planex/$(1),mzk-w300nh,board=MZK-W300NH)
+endef
+
+define Image/Build/Profile/TLWR741NDV1
+       $(call Image/Build/Template/TPLINK4K/$(1),tl-wr741ndv1,board=TL-WR741ND,TL-WR741NDv1)
+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/WRT400N
+       $(call Image/Build/Template/WRT400N/$(1),wrt400n,board=WRT400N)
+endef
+
+define Image/Build/Profile/WRT160NL
+       $(call Image/Build/Template/CyberTAN/$(1),wrt160nl,board=WRT160NL,1.00.01)
+endef
+
 define Image/Build/Profile/Default
+       $(call Image/Build/Profile/AP83,$(1))
        $(call Image/Build/Profile/A02RBW300N,$(1))
        $(call Image/Build/Profile/DIR615C1,$(1))
        $(call Image/Build/Profile/MZKW04NU,$(1))
+       $(call Image/Build/Profile/MZKW300NH,$(1))
        $(call Image/Build/Profile/TEW632BRP,$(1))
        $(call Image/Build/Profile/TEW652BRP,$(1))
+       $(call Image/Build/Profile/TLWR741NDV1,$(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/UBNT,$(1))
        $(call Image/Build/Profile/WP543,$(1))
+       $(call Image/Build/Profile/WRT400N,$(1))
+       $(call Image/Build/Profile/WRT160NL,$(1))
 endef
 
 define Image/Build/Profile/Madwifi
-       $(call Image/Build/Profile/UBNTRS,$(1))
+       $(call Image/Build/Profile/UBNT,$(1))
        $(call Image/Build/Profile/WP543,$(1))
 endef
 
 define Image/Build/squashfs
+       dd if=$(KDIR)/root.squashfs of=$(IMGNAME)-root.squashfs-4k bs=4k conv=sync
+       $(call add_jffs2_mark,$(IMGNAME)-root.squashfs-4k)
        $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
 endef
 
Personal OpenWRT clone
This page took 0.0335 seconds and 4 git commands to generate.