From b958c12d2c646a787f1eb37a334c3492778535c3 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Fri, 4 Sep 2015 14:45:09 +0000 Subject: [PATCH] image: move netgear-image to top and rename to -dni Use the same naming as netgear-chk. Signed-off-by: Jonas Gorski SVN-Revision: 46791 --- include/image.mk | 9 +++++++++ target/linux/ar71xx/image/Makefile | 13 ++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/image.mk b/include/image.mk index 8ac3593eae..d9fa03e454 100644 --- a/include/image.mk +++ b/include/image.mk @@ -308,6 +308,15 @@ define Build/netgear-chk mv $@.new $@ endef +define Build/netgear-dni + $(STAGING_DIR_HOST)/bin/mkdniimg \ + -B $(NETGEAR_BOARD_ID) -v OpenWrt.$(REVISION) \ + $(if $(NETGEAR_HW_ID),-H $(NETGEAR_HW_ID)) \ + -r "$(1)" \ + -i $@ -o $@.new + mv $@.new $@ +endef + define Build/fit $(TOPDIR)/scripts/mkits.sh \ -D $(DEVICE_NAME) -o $@.its -k $@ \ diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 04597f2c82..e6fe36ad09 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -37,15 +37,6 @@ define Build/netgear-uImage $(call Build/uImage,$(1) -M $(NETGEAR_KERNEL_MAGIC)) endef -define Build/netgear-image - $(STAGING_DIR_HOST)/bin/mkdniimg \ - -B $(NETGEAR_BOARD_ID) -v OpenWrt.$(REVISION) \ - $(if $(NETGEAR_HW_ID),-H $(NETGEAR_HW_ID)) \ - -r "$(1)" \ - -i $@ -o $@.new - mv $@.new $@ -endef - # combine kernel and rootfs into one image # -a align the rootfs start on an bytes boundary # -j add jffs2 end-of-filesystem markers @@ -198,8 +189,8 @@ define Device/wndr3700 KERNEL := kernel-bin | patch-cmdline | lzma -d20 | netgear-uImage lzma IMAGE/default = append-kernel $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs IMAGE/sysupgrade.bin = $$(IMAGE/default) | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.img = $$(IMAGE/default) | netgear-image | check-size $$$$(IMAGE_SIZE) - IMAGE/factory-NA.img = $$(IMAGE/default) | netgear-image NA | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.img = $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE) + IMAGE/factory-NA.img = $$(IMAGE/default) | netgear-dni NA | check-size $$$$(IMAGE_SIZE) endef define Device/wndr3700v2 -- 2.25.1