ar71xx: fix wndr3800 machine name

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

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index d687f6f..790dfda 100644 (file)
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -134,10 +134,10 @@ define Image/Build/WZRHPG30XNH
                        echo -n -e "# Airstation Public Fmt1\x00\x00\x00\x00\x00\x00\x00\x00"; \
                        dd if=$(call sysupname,$(1),$(2)); \
                ) > $(call imgname,$(1),$(2))-tftp.bin; \
                        echo -n -e "# Airstation Public Fmt1\x00\x00\x00\x00\x00\x00\x00\x00"; \
                        dd if=$(call sysupname,$(1),$(2)); \
                ) > $(call imgname,$(1),$(2))-tftp.bin; \

-               buffalo-enc -p $(4) -v 1.76 \
+               buffalo-enc -p $(4) -v 1.99 \

                        -i $(call sysupname,$(1),$(2)) \
                        -o $(KDIR)/$(2).enc; \
                        -i $(call sysupname,$(1),$(2)) \
                        -o $(KDIR)/$(2).enc; \

-               buffalo-tag -b $(4) -p $(4) -a ath -v 1.76 -m 1.01 -l mlang8 \
+               buffalo-tag -b $(4) -p $(4) -a ath -v 1.99 -m 1.01 -l mlang8 \

                        -w 3 -c 0x80041000 -d 0x801e8000 -f 1 -r M_ \
                        -i $(KDIR)/$(2).enc \
                        -o $(call factoryname,$(1),$(2)); \
                        -w 3 -c 0x80041000 -d 0x801e8000 -f 1 -r M_ \
                        -i $(KDIR)/$(2).enc \
                        -o $(call factoryname,$(1),$(2)); \


@@ -152,10 +152,10 @@ define Image/Build/WHRHPG300N
                        echo -n -e "# Airstation Public Fmt1\x00\x00\x00\x00\x00\x00\x00\x00"; \
                        dd if=$(call sysupname,$(1),$(2)); \
                ) > $(call imgname,$(1),$(2))-tftp.bin; \
                        echo -n -e "# Airstation Public Fmt1\x00\x00\x00\x00\x00\x00\x00\x00"; \
                        dd if=$(call sysupname,$(1),$(2)); \
                ) > $(call imgname,$(1),$(2))-tftp.bin; \

-               buffalo-enc -p $(5) -v 1.76 \
+               buffalo-enc -p $(5) -v 1.99 \

                        -i $(call sysupname,$(1),$(2)) \
                        -o $(KDIR)/$(2).enc; \
                        -i $(call sysupname,$(1),$(2)) \
                        -o $(KDIR)/$(2).enc; \

-               buffalo-tag -b $(5) -p $(5) -a ath -v 1.76 -m 1.01 -l mlang8 \
+               buffalo-tag -b $(5) -p $(5) -a ath -v 1.99 -m 1.01 -l mlang8 \

                        -w 3 -c 0x80041000 -d 0x801e8000 -f 1 -r M_ \
                        -i $(KDIR)/$(2).enc \
                        -o $(call factoryname,$(1),$(2)); \
                        -w 3 -c 0x80041000 -d 0x801e8000 -f 1 -r M_ \
                        -i $(KDIR)/$(2).enc \
                        -o $(call factoryname,$(1),$(2)); \


@@ -201,6 +201,7 @@ endef
 
 define Image/Build/AthGzip/initramfs
        $(call MkuImageLzma,$(2),$(3) $($(4)))
 
 define Image/Build/AthGzip/initramfs
        $(call MkuImageLzma,$(2),$(3) $($(4)))

+       $(CP) $(KDIR)/vmlinux-$(2).uImage $(call imgname,$(1),$(2))-uImage.bin

 endef
 
 define Image/Build/AthLzma
 endef
 
 define Image/Build/AthLzma


@@ -210,6 +211,7 @@ endef
 
 define Image/Build/AthLzma/initramfs
        $(call MkuImageLzma,$(2),$(3) $($(4)))
 
 define Image/Build/AthLzma/initramfs
        $(call MkuImageLzma,$(2),$(3) $($(4)))

+       $(CP) $(KDIR)/vmlinux-$(2).uImage $(call imgname,$(1),$(2))-uImage.bin

 endef
 
 define Image/Build/PB4X
 endef
 
 define Image/Build/PB4X


@@ -461,8 +463,9 @@ define Image/Build/Profile/AP96
 endef
 
 db120_cmdline=board=DB120 console=ttyS0,115200
 endef
 
 db120_cmdline=board=DB120 console=ttyS0,115200

+db120_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6336k(rootfs),1408k(kernel),64k(nvram),64k(art)ro,7744k@0x50000(firmware)

 define Image/Build/Profile/DB120
 define Image/Build/Profile/DB120

-       $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,db120,$(db120_cmdline),,1441792,6488064,RK)
+       $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,db120,$(db120_cmdline),db120_mtdlayout,1441792,6488064,RK)

 endef
 
 pb42_cmdline=board=PB42 console=ttyS0,115200
 endef
 
 pb42_cmdline=board=PB42 console=ttyS0,115200


@@ -686,10 +689,11 @@ wndr3700_cmdline=board=WNDR3700 console=ttyS0,115200
 wndr3700_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),6656k(rootfs),64k(art)ro,7680k@0x70000(firmware)
 wndr3700v2_cmdline=board=WNDR3700v2 console=ttyS0,115200
 wndr3700v2_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),14848k(rootfs),64k(art)ro,15872k@0x70000(firmware)
 wndr3700_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),6656k(rootfs),64k(art)ro,7680k@0x70000(firmware)
 wndr3700v2_cmdline=board=WNDR3700v2 console=ttyS0,115200
 wndr3700v2_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),14848k(rootfs),64k(art)ro,15872k@0x70000(firmware)

+wndr3800_cmdline=board=WNDR3800 console=ttyS0,115200

 define Image/Build/Profile/WNDR3700
        $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700,$(wndr3700_cmdline),wndr3700_mtdlayout,3700,WNDR3700,"" NA,)
        $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700v2,$(wndr3700v2_cmdline),wndr3700v2_mtdlayout,3701,WNDR3700v2,"",-H 29763654+16+64)
 define Image/Build/Profile/WNDR3700
        $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700,$(wndr3700_cmdline),wndr3700_mtdlayout,3700,WNDR3700,"" NA,)
        $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700v2,$(wndr3700v2_cmdline),wndr3700v2_mtdlayout,3701,WNDR3700v2,"",-H 29763654+16+64)

-       $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3800,$(wndr3700v2_cmdline),wndr3700v2_mtdlayout,3701,WNDR3800,"",-H 29763654+16+128)
+       $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3800,$(wndr3800_cmdline),wndr3700v2_mtdlayout,3701,WNDR3800,"",-H 29763654+16+128)

 endef
 
 wr400n_cmdline=board=WRT400N console=ttyS0,115200
 endef
 
 wr400n_cmdline=board=WRT400N console=ttyS0,115200