From: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
Date: Wed, 2 Jan 2019 22:19:04 +0000 (-0800)
Subject: ath79: remove more duplicate image build variables
X-Git-Tag: v19.07.0-rc1~805
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d75d4837fc714284042210f0704cf495f0d0c956;p=openwrt%2Fstaging%2Fpepe2k.git

ath79: remove more duplicate image build variables

Remove Netgear-specific image build variables which are set to the same
value.

Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
[reordering of variables, removed stray newline]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/target/linux/ath79/image/common-netgear.mk b/target/linux/ath79/image/common-netgear.mk
index 5dfcd38a92..956266ab2c 100644
--- a/target/linux/ath79/image/common-netgear.mk
+++ b/target/linux/ath79/image/common-netgear.mk
@@ -22,3 +22,10 @@ endef
 define Build/netgear-uImage
 	$(call Build/uImage,$(1) -M $(NETGEAR_KERNEL_MAGIC))
 endef
+
+define Device/netgear_ath79
+  KERNEL := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma
+  IMAGES += factory.img
+  IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE)
+  IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE)
+endef
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index 08d36f25d7..42a1b72598 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -546,12 +546,9 @@ TARGET_DEVICES += pcs_cr5000
 
 define Device/netgear_wndr3x00
   ATH_SOC := ar7161
-  KERNEL := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma
-  IMAGES += factory.img
   IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs
-  IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE)
-  IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE)
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport kmod-leds-reset kmod-owl-loader
+  $(Device/netgear_ath79)
 endef
 
 define Device/netgear_wndr3700
diff --git a/target/linux/ath79/image/tiny-netgear.mk b/target/linux/ath79/image/tiny-netgear.mk
index 8d0de15a1b..42d6cab8bd 100644
--- a/target/linux/ath79/image/tiny-netgear.mk
+++ b/target/linux/ath79/image/tiny-netgear.mk
@@ -1,35 +1,27 @@
 include ./common-netgear.mk
 
-
-define Device/netgear_wnr612-v2
+define Device/netgear_ar7240
   ATH_SOC := ar7240
-  DEVICE_TITLE := Netgear WNR612v2
-  DEVICE_DTS := ar7240_netgear_wnr612-v2
   NETGEAR_KERNEL_MAGIC := 0x32303631
-  KERNEL := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma
   KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma
-  NETGEAR_BOARD_ID := REALWNR612V2
   IMAGE_SIZE := 3904k
-  IMAGES += factory.img
   IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs
-  IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE)
-  IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE)
+  $(Device/netgear_ath79)
+endef
+
+define Device/netgear_wnr612-v2
+  $(Device/netgear_ar7240)
+  DEVICE_TITLE := Netgear WNR612v2
+  DEVICE_DTS := ar7240_netgear_wnr612-v2
+  NETGEAR_BOARD_ID := REALWNR612V2
   SUPPORTED_DEVICES += wnr612-v2
 endef
 TARGET_DEVICES += netgear_wnr612-v2
 
 define Device/on_n150r
-  ATH_SOC := ar7240
+  $(Device/netgear_ar7240)
   DEVICE_TITLE := ON Network N150R
-  NETGEAR_KERNEL_MAGIC := 0x32303631
-  KERNEL := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma
-  KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma
   NETGEAR_BOARD_ID := N150R
-  IMAGE_SIZE := 3904k
-  IMAGES += factory.img
-  IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs
-  IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE)
-  IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE)
   SUPPORTED_DEVICES += n150r
 endef
 TARGET_DEVICES += on_n150r