From: Gabor Juhos Date: Wed, 7 Dec 2011 06:55:50 +0000 (+0000) Subject: ar71xx: fix WNDR3x00 factory image generation X-Git-Tag: reboot~15345 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6e69765559ed8993db5ac8697d944e80abcda57d;p=oweals%2Fopenwrt.git ar71xx: fix WNDR3x00 factory image generation Factory images for WNDR3700v2 and WNDR3800 should contain these model IDs for the device: field in their DNI tags, not WNDR3700. This regressed in r29434, which redid WNDR3x00 model detection. The sixth parameter to Image/Build/Netgear is only used as the -B argument to mkdniimg, which is used to set the device: field. In r29434, this was erroneously changed to be WNDR3700 for all models. The tools to flash factory images (U-Boot's TFTP server and the factory software's upgrade utility) may refuse to honor images with incorrect device: fields in their DNI tags. Signed-off-by: Mark Mentovai SVN-Revision: 29473 --- diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 324899d40f..a58f53ac61 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -795,8 +795,8 @@ wndr3700_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kerne wndr3700v2_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),14848k(rootfs),64k(art)ro,15872k@0x70000(firmware) 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,$(wndr3700_cmdline),$(wndr3700v2_mtdlayout),3701,WNDR3700,"",-H 29763654+16+64) - $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3800,$(wndr3700_cmdline),$(wndr3700v2_mtdlayout),3701,WNDR3700,"",-H 29763654+16+128) + $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700v2,$(wndr3700_cmdline),$(wndr3700v2_mtdlayout),3701,WNDR3700v2,"",-H 29763654+16+64) + $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3800,$(wndr3700_cmdline),$(wndr3700v2_mtdlayout),3701,WNDR3800,"",-H 29763654+16+128) endef wr400n_cmdline=board=WRT400N console=ttyS0,115200