projects / openwrt / svn-archive / archive.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ar71xx: use the lzma kernel and a proper size limit for pb92
[openwrt/svn-archive/archive.git] / target / linux / ar71xx / image / Makefile
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 2f990da080174177700ec8e88e8b122d33a1911d..942ef12082f434df93116f7ed9f719b8bbbf157f 100644 (file)
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2009 OpenWrt.org
+# Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,14 +7,12 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-IMGNAME:=$(BIN_DIR)/openwrt-$(BOARD)
-
 define imgname
-$(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))
+$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))
 endef
 
-VMLINUX:=$(IMGNAME)-vmlinux
-UIMAGE:=$(IMGNAME)-uImage
+VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux
+UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
 fs_squash:=squashfs-only
 fs_all:=all
 fs_4k:=4k
@@ -26,8 +24,8 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
        fs_4k:=initramfs
        fs_64k:=initramfs
        fs_128k:=initramfs
-       VMLINUX:=$(IMGNAME)-vmlinux-initramfs
-       UIMAGE:=$(IMGNAME)-uImage-initramfs
+       VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux-initramfs
+       UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage-initramfs
 endif
 
 define CompressLzma
@@ -83,47 +81,40 @@ define Image/Build/WRT400N
                        -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
-
-dir600a1_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(nvram)ro,896k(kernel),2816k(rootfs),64k(mac)ro,64k(art)ro,3712k@0x40000(firmware)
-define Image/Build/DIR600A1
-       $(call PatchKernelLzma,$(2),$(3) $(dir600a1_mtdlayout))
-       if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 917504 ]; then \
-               echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
-       else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 2818048 ]; 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=896k conv=sync; \
-                       dd if=$(KDIR)/root.$(1) bs=2752k conv=sync; \
-                       echo -n "AP91-AR7240-RT-090223-00"; \
-               ) > $(call imgname,$(1),$(2))-universal.bin; \
+                       dd if=$(KDIR)/root.$(1) \
+               ) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
+               wrt400n $(KDIR)/vmlinux-$(2).uImage $(KDIR)/root.$(1) $(call imgname,$(1),$(2))-factory.bin; \
        fi; fi
 endef
 
 dir825b1_mtdlayout=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,1024k(kernel),5184k(rootfs),64k(caldata)ro,1600k(unknown)ro,6208k@0x50000(firmware)
 define Image/Build/DIR825B1
        $(call PatchKernelLzma,$(2),$(3) $(dir825b1_mtdlayout))
-       $(call MkImageLzma,$(KDIR)/vmlinux-$(2).bin.lzma,$(call imgname,$(1),$(2)).bin)
-       if [ `stat -c%s "$(call imgname,$(1),$(2)).bin"` -gt 1048576 ]; then \
+       if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 1048576 ]; then \
                echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
-               rm -f $(call imgname,$(1),$(2)).bin; \
        else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 5308416 ]; then \
                echo "Warning: $(KDIR)/root.$(1) is too big"; \
-               rm -f $(call imgname,$(1),$(2)).bin; \
        else \
-               dd if=$(KDIR)/root.$(1) of=$(call imgname,$(1),$(2)).bin bs=1k seek=1024; \
-               cp $(call imgname,$(1),$(2)).bin $(call imgname,$(1),$(2))-backup-loader.bin; \
-               echo -n "01AP94-AR7161-RT-080619-00" >> $(call imgname,$(1),$(2))-backup-loader.bin; \
+               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=1024k conv=sync; \
+                       dd if=$(KDIR)/root.$(1) \
+               ) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
+               ( \
+                       dd if=$(call imgname,$(1),$(2))-sysupgrade.bin; \
+                       echo -n "01AP94-AR7161-RT-080619-00"; \
+               ) > $(call imgname,$(1),$(2))-backup-loader.bin; \
+               if [ `stat -c%s $(call imgname,$(1),$(2))-sysupgrade.bin` -gt 4194304 ]; then \
+                       echo "Warning: $(call imgname,$(1),$(2))-sysupgrade.bin is too big"; \
+               else \
+                       ( \
+                               dd if=$(call imgname,$(1),$(2))-sysupgrade.bin bs=4096k conv=sync; \
+                               echo -n "00AP94-AR7161-RT-080619-00"; \
+                       ) > $(call imgname,$(1),$(2))-factory.bin; \
+               fi; \
        fi; fi
 endef
 
@@ -149,7 +140,7 @@ define Image/Build/WZRHPG300NH
        fi; fi
 endef
 
-cameo_mtdlayout=mtdparts=spi0.0:128k(u-boot)ro,64k(config)ro,896k(kernel),2880k(rootfs),64k(art)ro,3776k@0x30000(firmware)
+cameo_mtdlayout=mtdparts=spi0.0:128k(u-boot)ro,64k(config)ro,896k(kernel),2944k(rootfs),64k(art)ro,3840k@0x30000(firmware)
 define Image/Build/Cameo
        $(call PatchKernelLzma,$(2),$(3) $(cameo_mtdlayout))
        if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 917504 ]; then \
@@ -161,11 +152,39 @@ define Image/Build/Cameo
                        0x80060000 \
                        -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
                        -d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
+               ( \
+                       dd if=$(KDIR)/vmlinux-$(2).uImage bs=896k conv=sync; \
+                       dd if=$(KDIR)/root.$(1) \
+               ) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
                ( \
                        dd if=$(KDIR)/vmlinux-$(2).uImage bs=896k conv=sync; \
                        dd if=$(KDIR)/root.$(1) bs=2880k conv=sync; \
                        echo -n $(4); \
-               ) > $(call imgname,$(1),$(2)).uni; \
+               ) > $(call imgname,$(1),$(2))-factory.bin; \
+       fi; fi
+endef
+
+cameo7240_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(nvram)ro,896k(kernel),2816k(rootfs),64k(mac)ro,64k(art)ro,3712k@0x40000(firmware)
+define Image/Build/Cameo7240
+       $(call PatchKernelLzma,$(2),$(3) $(cameo7240_mtdlayout))
+       if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 917504 ]; then \
+               echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
+       else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 2818048 ]; 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=896k conv=sync; \
+                       dd if=$(KDIR)/root.$(1) \
+               ) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
+               ( \
+                       dd if=$(KDIR)/vmlinux-$(2).uImage bs=896k conv=sync; \
+                       dd if=$(KDIR)/root.$(1) bs=2752k conv=sync; \
+                       echo -n $(4); \
+               ) > $(call imgname,$(1),$(2))-factory.bin; \
        fi; fi
 endef
 
@@ -192,6 +211,29 @@ define Image/Build/AP83
        fi; fi
 endef
 
+define Image/Build/PB92
+       $(call PatchKernelLzma,$(2),$(3))
+       if [ `stat -c%s $(KDIR)/vmlinux-$(2).bin.lzma` -gt 917504 ]; then \
+               echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
+       elif [ `stat -c%s $(KDIR)/root.$(1)` -gt 2818048 ]; 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 \
+                       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=896k conv=sync; \
+                       dd if=$(KDIR)/root.$(1); \
+               ) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
+       fi
+endef
+
 define Image/Build/PB4X
        $(call PatchKernelLzma,$(2),$(3))
        dd if=$(KDIR)/vmlinux-$(2).bin.lzma \
@@ -219,11 +261,11 @@ define Image/Build/UBNTXM
        -$(STAGING_DIR_HOST)/bin/mkfwimage \
                -B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \
                -k $(KDIR)/vmlinux-$(2).uImage \
-               -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
+               -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
                -o $(call imgname,$(1),$(2))-factory.bin
        ( \
                dd if=$(KDIR)/vmlinux-$(2).uImage; \
-               dd if=$(BIN_DIR)/openwrt-$(BOARD)-root.$(1); \
+               dd if=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1); \
        ) > $(call imgname,$(1),$(2))-sysupgrade.bin
 endef
 
@@ -233,11 +275,11 @@ define Image/Build/UBNT
        -$(STAGING_DIR_HOST)/bin/mkfwimage \
                -B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \
                -k $(KDIR)/vmlinux-$(2).lzma \
-               -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
+               -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
                -o $(call imgname,$(1),$(2))-factory.bin
        -sh $(TOPDIR)/scripts/combined-image.sh \
                "$(KDIR)/vmlinux-$(2).lzma" \
-               "$(BIN_DIR)/openwrt-$(BOARD)-root.$(1)" \
+               "$(BIN_DIR)/$(IMG_PREFIX)-root.$(1)" \
                $(call imgname,$(1),$(2))-sysupgrade.bin
 endef
 
@@ -254,13 +296,13 @@ define Image/Build/Planex
                        -d $(KDIR)/vmlinux-$(2).bin.gz $(KDIR)/vmlinux-$(2).uImage; \
                ( \
                        dd if=$(KDIR)/vmlinux-$(2).uImage bs=1408k conv=sync; \
-                       dd if=$(KDIR)/root.$(1) bs=6208k conv=sync; \
-               ) > $(call imgname,$(1),$(2)).bin; \
+                       dd if=$(KDIR)/root.$(1); \
+               ) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
                $(STAGING_DIR_HOST)/bin/mkplanexfw \
                        -B $(2) \
                        -v 2.00.00 \
-                       -i $(call imgname,$(1),$(2)).bin \
-                       -o $(call imgname,$(1),$(2)).webui; \
+                       -i $(call imgname,$(1),$(2))-sysupgrade.bin \
+                       -o $(call imgname,$(1),$(2))-factory.bin; \
        fi; fi
 endef
 
@@ -269,19 +311,19 @@ define Image/Build/TPLINK
        -$(STAGING_DIR_HOST)/bin/mktplinkfw \
                -B $(4) -N OpenWrt -V $(REVISION)\
                -k $(KDIR)/vmlinux-$(2).bin.gz \
-               -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
+               -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
                -o $(call imgname,$(1),$(2))-factory.bin
        -$(STAGING_DIR_HOST)/bin/mktplinkfw \
                -B $(4) -N OpenWrt -V $(REVISION) -s \
                -k $(KDIR)/vmlinux-$(2).bin.gz \
-               -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
+               -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
                -o $(call imgname,$(1),$(2))-sysupgrade.bin
 endef
 
 define Image/Build/TPLINK/initramfs
        $(call PatchKernelGzip,$(2),$(3))
        -$(STAGING_DIR_HOST)/bin/mktplinkfw -c \
-               -B $(4) -N OpenWrt -V $(REVISION)\
+               -B $(4) -N OpenWrt -V $(REVISION) -s \
                -k $(KDIR)/vmlinux-$(2).bin.gz \
                -o $(call imgname,$(1),$(2))-uImage.bin
 endef
@@ -289,16 +331,15 @@ endef
 define Image/Build/CyberTAN
        $(call PatchKernelGzip,$(2),$(3))
        $(call MkImageGzip,$(KDIR)/vmlinux-$(2).bin.gz,$(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/trx -o $(KDIR)/image.tmp -f $(KDIR)/vmlinux-$(2).uImage \
+               -x 32 -a 0x10000 -x -32 -f $(KDIR)/root.$(1)
+       -$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(4) \
+               -i $(KDIR)/image.tmp \
+               -o $(call imgname,$(1),$(2))-sysupgrade.bin
        -$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(4) -g \
-               -i $(KDIR)/vmlinux-$(2).trx \
-               -o $(call imgname,$(1),$(2)).bin
+               -i $(KDIR)/image.tmp \
+               -o $(call imgname,$(1),$(2))-factory.bin
+       rm $(KDIR)/image.tmp
 endef
 
 wndr3700_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),6656k(rootfs),64k(art)ro,7680k@0x70000(firmware)
@@ -396,6 +437,10 @@ define Image/Build/Profile/PB44
        $(call Image/Build/Template/$(fs_64k)/$(1),PB4X,pb44,board=PB44)
 endef
 
+define Image/Build/Profile/PB92
+       $(call Image/Build/Template/$(fs_64k)/$(1),PB92,pb92,board=PB92)
+endef
+
 define Image/Build/Profile/WP543
        $(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,0x200000,2M)
        $(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,0x400000,4M)
@@ -404,7 +449,11 @@ define Image/Build/Profile/WP543
 endef
 
 define Image/Build/Profile/DIR600A1
-       $(call Image/Build/Template/$(fs_64k)/$(1),DIR600A1,dir-600-a1,board=DIR-600-A1)
+       $(call Image/Build/Template/$(fs_64k)/$(1),Cameo7240,dir-600-a1,board=DIR-600-A1,"AP91-AR7240-RT-090223-00")
+endef
+
+define Image/Build/Profile/FR54RTR
+       $(call Image/Build/Template/$(fs_64k)/$(1),Cameo7240,fr-54rtr,board=DIR-600-A1,"AP91-AR7240-RT-090223-01")
 endef
 
 define Image/Build/Profile/DIR615C1
@@ -484,6 +533,10 @@ define Image/Build/Profile/TLWR941NDV2
        $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr941nd-v2,board=TL-WR941ND,TL-WR941NDv2)
 endef
 
+define Image/Build/Profile/TLWR941NDV3
+       $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr941nd-v3,board=TL-WR941ND,TL-WR941NDv2)
+endef
+
 define Image/Build/Profile/TLWR941NDV4
        $(call Image/Build/Template/$(fs_4k)/$(1),TPLINK,tl-wr941nd-v4,board=TL-WR741ND,TL-WR941NDv4)
 endef
@@ -519,10 +572,12 @@ define Image/Build/Profile/Default
        $(call Image/Build/Profile/DIR600A1,$(1))
        $(call Image/Build/Profile/DIR615C1,$(1))
        $(call Image/Build/Profile/DIR825B1,$(1))
+       $(call Image/Build/Profile/FR54RTR,$(1))
        $(call Image/Build/Profile/MZKW04NU,$(1))
        $(call Image/Build/Profile/MZKW300NH,$(1))
        $(call Image/Build/Profile/PB42,$(1))
        $(call Image/Build/Profile/PB44,$(1))
+       $(call Image/Build/Profile/PB92,$(1))
        $(call Image/Build/Profile/TEW632BRP,$(1))
        $(call Image/Build/Profile/TEW652BRP,$(1))
        $(call Image/Build/Profile/TLWR741NDV1,$(1))
@@ -530,6 +585,7 @@ define Image/Build/Profile/Default
        $(call Image/Build/Profile/TLWR841NDV3,$(1))
        $(call Image/Build/Profile/TLWR841NDV5,$(1))
        $(call Image/Build/Profile/TLWR941NDV2,$(1))
+       $(call Image/Build/Profile/TLWR941NDV3,$(1))
        $(call Image/Build/Profile/TLWR941NDV4,$(1))
        $(call Image/Build/Profile/TLWR1043NDV1,$(1))
        $(call Image/Build/Profile/UBNT,$(1))
@@ -551,8 +607,8 @@ define Image/Build/squashfs
        $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
        dd if=$(KDIR)/root.squashfs of=$(KDIR)/root.squashfs-4k.tmp0 bs=4k conv=sync
        $(call add_jffs2_mark,$(KDIR)/root.squashfs-4k.tmp0)
-       dd if=$(KDIR)/root.squashfs-4k.tmp0 of=$(IMGNAME)-root.squashfs-4k bs=4k conv=sync
-       $(call add_jffs2_mark,$(IMGNAME)-root.squashfs-4k)
+       dd if=$(KDIR)/root.squashfs-4k.tmp0 of=$(BIN_DIR)/$(IMG_PREFIX)-root.squashfs-4k bs=4k conv=sync
+       $(call add_jffs2_mark,$(BIN_DIR)/$(IMG_PREFIX)-root.squashfs-4k)
        rm -f $(KDIR)/root.squashfs-4k.tmp0
 endef
 
@@ -562,7 +618,7 @@ endef
 
 define Image/Build
        $(call Image/Build/$(1))
-       dd if=$(KDIR)/root.$(1) of=$(IMGNAME)-root.$(1) bs=128k conv=sync
+       dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
 
        $(call Image/Build/Profile/$(PROFILE),$(1))
 endef
OpenWrt SVN history