aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-05-31 22:53:25 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-05-31 22:53:25 +0000
commit761e67b394e61ebd268917657ec6135dd7650e0d (patch)
tree35519fa4ca7e667d3b0c2f697386fcbff7041fb9
parent145402e11b0a4299c7cb8c666dbb1309281e89d5 (diff)
downloadupstream-761e67b394e61ebd268917657ec6135dd7650e0d.tar.gz
upstream-761e67b394e61ebd268917657ec6135dd7650e0d.tar.bz2
upstream-761e67b394e61ebd268917657ec6135dd7650e0d.zip
ar71xx: stop producing -NA factory images and tag factory images with hd_id for WNDR3700v2
NETGEAR doesn’t produce a distinct North American image for WNDR3700v2, they use the same image worldwide. This is a change from earlier models such as WNDR3700 (v1). NETGEAR's v2 images now contain an "hd_id" parameter, as well. All observed WNDR3700v2, WNDR3800, and WNDRMAC images use 29763654+16+64 as their hd_id value. This patch changes the OpenWrt WNDR3700v2 "factory" image generation to stop producing the extraneous -NA version and to tag the image with the same hd_id used in NETGEAR's images. There is no change to WNDR3700 (v1) image generation, as NETGEAR continues to produce distinct -NA and worldwide images, neither of which are tagged with hd_id. Signed-off-by: Mark Mentovai <mark@moxienet.com> SVN-Revision: 27053
-rw-r--r--target/linux/ar71xx/image/Makefile39
1 files changed, 19 insertions, 20 deletions
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 8e5bfa40dd..a4ea554e89 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -398,14 +398,13 @@ define Image/Build/Netgear
dd if=$(KDIR)/vmlinux-$(2).uImage.squashfs bs=1024k conv=sync; \
dd if=$(KDIR)/root.$(1) bs=64k; \
) > $(call imgname,$(1),$(2))-sysupgrade.bin
- $(STAGING_DIR_HOST)/bin/mkdniimg \
- -B $(6) -v OpenWrt.$(REVISION) \
- -i $(call imgname,$(1),$(2))-sysupgrade.bin \
- -o $(call imgname,$(1),$(2))-factory.img
- $(STAGING_DIR_HOST)/bin/mkdniimg \
- -B $(6) -v OpenWrt.$(REVISION) -r "NA" \
- -i $(call imgname,$(1),$(2))-sysupgrade.bin \
- -o $(call imgname,$(1),$(2))-factory-NA.img
+ for r in $(7) ; do \
+ [ -n "$$$$r" ] && dashr="-$$$$r" || dashr= ; \
+ $(STAGING_DIR_HOST)/bin/mkdniimg \
+ -B $(6) -v OpenWrt.$(REVISION) -r "$$$$r" $(8) \
+ -i $(call imgname,$(1),$(2))-sysupgrade.bin \
+ -o $(call imgname,$(1),$(2))-factory$$$$dashr.img; \
+ done
endef
define Image/Build/Netgear/initramfs
@@ -459,43 +458,43 @@ define Image/Build/Zcomax
endef
define Image/Build/Template/initramfs/initramfs
- $(call Image/Build/$(1)/initramfs,initramfs,$(2),$(3),$(4),$(5),$(6),$(7))
+ $(call Image/Build/$(1)/initramfs,initramfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef
define Image/Build/Template/all/squashfs
- $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7))
+ $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef
define Image/Build/Template/all/jffs2-64k
- $(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7))
+ $(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef
define Image/Build/Template/all/jffs2-128k
- $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7))
+ $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef
define Image/Build/Template/squashfs-only/squashfs
- $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7))
+ $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef
define Image/Build/Template/4k/squashfs
- $(call Image/Build/$(1),squashfs-4k,$(2),$(3),$(4),$(5),$(6),$(7))
+ $(call Image/Build/$(1),squashfs-4k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef
define Image/Build/Template/64k/squashfs
- $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7))
+ $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef
define Image/Build/Template/64k/jffs2-64k
- $(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7))
+ $(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef
define Image/Build/Template/128k/squashfs
- $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7))
+ $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef
define Image/Build/Template/128k/jffs2-128k
- $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7))
+ $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef
ap81_cmdline=board=AP81 console=ttyS0,115200
@@ -716,8 +715,8 @@ wndr3700_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kerne
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)
define Image/Build/Profile/WNDR3700
- $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700,$(wndr3700_cmdline),wndr3700_mtdlayout,3700,WNDR3700)
- $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700v2,$(wndr3700v2_cmdline),wndr3700v2_mtdlayout,3701,WNDR3700v2)
+ $(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)
endef
ap96_cmdline=board=AP96 console=ttyS0,115200