From 01a3e891d745ea15b149483bde43d6dfe75cd1fa Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 25 Jul 2020 20:29:12 +0200 Subject: [PATCH] ath79: reorganize common image definitions for Netgear Netgear currently has a special definition for tiny devices, which is only used by two devices. Despite, it sets ups the IMAGE/default definition individually for all devices, although there is actually only one exception. This merges the common parts into a single netgear_generic definition (in contrast to netgear_ath79_nand), and adjusts the individual definitions accordingly. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/image/common-netgear.mk | 5 +++- target/linux/ath79/image/generic.mk | 14 +++++------ target/linux/ath79/image/tiny-netgear.mk | 28 ++++++++-------------- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/target/linux/ath79/image/common-netgear.mk b/target/linux/ath79/image/common-netgear.mk index 51808069e3b..b41650c6e99 100644 --- a/target/linux/ath79/image/common-netgear.mk +++ b/target/linux/ath79/image/common-netgear.mk @@ -33,10 +33,13 @@ define Build/netgear-uImage $(call Build/uImage,$(1) -M $(NETGEAR_KERNEL_MAGIC)) endef -define Device/netgear_ath79 +define Device/netgear_generic DEVICE_VENDOR := NETGEAR KERNEL := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma + KERNEL_INITRAMFS := 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/factory.img := $$(IMAGE/default) | netgear-dni | \ diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index adc7772c0ed..2e52be09592 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -1042,6 +1042,7 @@ endef TARGET_DEVICES += nec_wg800hp define Device/netgear_ex6400_ex7300 + $(Device/netgear_generic) SOC := qca9558 NETGEAR_KERNEL_MAGIC := 0x27051956 NETGEAR_BOARD_ID := EX7300series @@ -1049,8 +1050,11 @@ define Device/netgear_ex6400_ex7300 IMAGE_SIZE := 15552k IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | \ netgear-rootfs | pad-rootfs + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ + check-size + IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | \ + check-size DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca99x0-ct - $(Device/netgear_ath79) endef define Device/netgear_ex6400 @@ -1066,12 +1070,10 @@ endef TARGET_DEVICES += netgear_ex7300 define Device/netgear_wndr3x00 + $(Device/netgear_generic) SOC := ar7161 - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \ - append-rootfs | pad-rootfs DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ kmod-leds-reset kmod-owl-loader - $(Device/netgear_ath79) endef define Device/netgear_wndr3700 @@ -1147,14 +1149,12 @@ endef TARGET_DEVICES += netgear_wndrmac-v2 define Device/netgear_wnr2200_common + $(Device/netgear_generic) SOC := ar7241 DEVICE_MODEL := WNR2200 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport NETGEAR_KERNEL_MAGIC := 0x32323030 NETGEAR_BOARD_ID := wnr2200 - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \ - append-rootfs | pad-rootfs - $(Device/netgear_ath79) endef define Device/netgear_wnr2200-8m diff --git a/target/linux/ath79/image/tiny-netgear.mk b/target/linux/ath79/image/tiny-netgear.mk index 5c83a10e017..0127e5bd97c 100644 --- a/target/linux/ath79/image/tiny-netgear.mk +++ b/target/linux/ath79/image/tiny-netgear.mk @@ -1,35 +1,32 @@ include ./common-netgear.mk -define Device/netgear_ar7240 - SOC := ar7240 - NETGEAR_KERNEL_MAGIC := 0x32303631 - KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma - IMAGE_SIZE := 3712k - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \ - append-rootfs | pad-rootfs - $(Device/netgear_ath79) -endef - define Device/netgear_wnr612-v2 - $(Device/netgear_ar7240) + $(Device/netgear_generic) + SOC := ar7240 DEVICE_MODEL := WNR612 DEVICE_VARIANT := v2 DEVICE_DTS := ar7240_netgear_wnr612-v2 + NETGEAR_KERNEL_MAGIC := 0x32303631 NETGEAR_BOARD_ID := REALWNR612V2 + IMAGE_SIZE := 3712k SUPPORTED_DEVICES += wnr612-v2 endef TARGET_DEVICES += netgear_wnr612-v2 define Device/on_n150r - $(Device/netgear_ar7240) + $(Device/netgear_generic) + SOC := ar7240 DEVICE_VENDOR := On Networks DEVICE_MODEL := N150R + NETGEAR_KERNEL_MAGIC := 0x32303631 NETGEAR_BOARD_ID := N150R + IMAGE_SIZE := 3712k SUPPORTED_DEVICES += n150r endef TARGET_DEVICES += on_n150r define Device/netgear_wnr1000-v2 + $(Device/netgear_generic) SOC := ar7240 DEVICE_MODEL := WNR1000 DEVICE_VARIANT := v2 @@ -37,14 +34,12 @@ define Device/netgear_wnr1000-v2 NETGEAR_BOARD_ID := WNR1000V2 NETGEAR_HW_ID := 29763331+4+32 IMAGE_SIZE := 3712k - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \ - append-rootfs | pad-rootfs SUPPORTED_DEVICES += wnr1000-v2 - $(Device/netgear_ath79) endef TARGET_DEVICES += netgear_wnr1000-v2 define Device/netgear_wnr2000-v3 + $(Device/netgear_generic) SOC := ar7241 DEVICE_MODEL := WNR2000 DEVICE_VARIANT := v3 @@ -52,12 +47,9 @@ define Device/netgear_wnr2000-v3 NETGEAR_BOARD_ID := WNR2000V3 NETGEAR_HW_ID := 29763551+04+32 IMAGE_SIZE := 3712k - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \ - append-rootfs | pad-rootfs IMAGES += factory-NA.img IMAGE/factory-NA.img := $$(IMAGE/default) | netgear-dni NA | \ check-size SUPPORTED_DEVICES += wnr2000-v3 - $(Device/netgear_ath79) endef TARGET_DEVICES += netgear_wnr2000-v3 -- 2.30.2