madwifi: fix the tx rate display in iwconfig (#6925)

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

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 5ac4dc1..00580fd 100644 (file)
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -141,11 +141,15 @@ 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
 
@@ -161,11 +165,15 @@ define Image/Build/Cameo7240
                        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))-universal.bin; \
+               ) > $(call imgname,$(1),$(2))-factory.bin; \
        fi; fi
 endef
 
@@ -192,6 +200,27 @@ define Image/Build/AP83
        fi; fi
 endef
 
+define Image/Build/PB92
+       $(call PatchKernelGzip,$(2),$(3))
+       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 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=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 \
@@ -281,7 +310,7 @@ 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 +318,12 @@ 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/addpattern -B $(2) -v v$(4) -g \
-               -i $(KDIR)/vmlinux-$(2).trx \
+       $(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)).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 +421,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)
@@ -407,6 +436,10 @@ define Image/Build/Profile/DIR600A1
        $(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
        $(call Image/Build/Template/$(fs_squash)/$(1),Cameo,dir-615-c1,board=DIR-615-C1,"AP81-AR9130-RT-070614-02")
 endef
@@ -519,10 +552,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))