diff options
| author | Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> | 2019-01-02 14:19:04 -0800 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2019-04-09 11:09:26 +0200 |
| commit | d75d4837fc714284042210f0704cf495f0d0c956 (patch) | |
| tree | ff80464a180f9db66fe3051e57142edbbb48fbd1 /target/linux | |
| parent | 1f839c85840df4b565c95a63adf0d428501bcb48 (diff) | |
| download | upstream-d75d4837fc714284042210f0704cf495f0d0c956.tar.gz upstream-d75d4837fc714284042210f0704cf495f0d0c956.tar.bz2 upstream-d75d4837fc714284042210f0704cf495f0d0c956.zip | |
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>
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/ath79/image/common-netgear.mk | 7 | ||||
| -rw-r--r-- | target/linux/ath79/image/generic.mk | 5 | ||||
| -rw-r--r-- | target/linux/ath79/image/tiny-netgear.mk | 28 |
3 files changed, 18 insertions, 22 deletions
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 |