aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2019-08-22 14:34:45 +0200
committerChristian Lamparter <chunkeey@gmail.com>2019-09-21 22:17:39 +0200
commitd1e3f32dcf63d19dcfe5cb4a1d8437e7a55cb96e (patch)
treea2614da6820e57eb436289d821f7f9a06fa0ee86
parent4fc0a61ed3da96330d30703a2a039a6a06dc0b2f (diff)
downloadupstream-d1e3f32dcf63d19dcfe5cb4a1d8437e7a55cb96e.tar.gz
upstream-d1e3f32dcf63d19dcfe5cb4a1d8437e7a55cb96e.tar.bz2
upstream-d1e3f32dcf63d19dcfe5cb4a1d8437e7a55cb96e.zip
ath79: sort device definitions in image/*
This applies alphabetic sorting to devices in image/* files. For certain cases, this patch deviates from strict sorting, e.g. to ensure that v10 comes after v9. While at it, fix an indent and remove some useless empty lines. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
-rw-r--r--target/linux/ath79/image/common-buffalo.mk16
-rw-r--r--target/linux/ath79/image/common-netgear.mk20
-rw-r--r--target/linux/ath79/image/generic-tp-link.mk212
-rw-r--r--target/linux/ath79/image/generic-ubnt.mk150
-rw-r--r--target/linux/ath79/image/generic.mk205
-rw-r--r--target/linux/ath79/image/tiny-tp-link.mk1
6 files changed, 301 insertions, 303 deletions
diff --git a/target/linux/ath79/image/common-buffalo.mk b/target/linux/ath79/image/common-buffalo.mk
index 8870af691e..d62b7eea94 100644
--- a/target/linux/ath79/image/common-buffalo.mk
+++ b/target/linux/ath79/image/common-buffalo.mk
@@ -1,11 +1,3 @@
-define Build/buffalo-tftp-header
- ( \
- echo -n -e "# Airstation Public Fmt1" | dd bs=32 count=1 conv=sync; \
- dd if=$@; \
- ) > $@.new
- mv $@.new $@
-endef
-
define Build/buffalo-tag
$(eval product=$(word 1,$(1)))
$(eval hwver=$(word 2,$(1)))
@@ -18,4 +10,10 @@ define Build/buffalo-tag
mv $@.new $@
endef
-
+define Build/buffalo-tftp-header
+ ( \
+ echo -n -e "# Airstation Public Fmt1" | dd bs=32 count=1 conv=sync; \
+ dd if=$@; \
+ ) > $@.new
+ mv $@.new $@
+endef
diff --git a/target/linux/ath79/image/common-netgear.mk b/target/linux/ath79/image/common-netgear.mk
index c722b82d27..8311222a91 100644
--- a/target/linux/ath79/image/common-netgear.mk
+++ b/target/linux/ath79/image/common-netgear.mk
@@ -1,5 +1,15 @@
DEVICE_VARS += NETGEAR_KERNEL_MAGIC NETGEAR_BOARD_ID NETGEAR_HW_ID
+define Build/netgear-rootfs
+ mkimage \
+ -A mips -O linux -T filesystem -C none \
+ -M $(NETGEAR_KERNEL_MAGIC) \
+ -n '$(VERSION_DIST) filesystem' \
+ -d $(IMAGE_ROOTFS) $@.fs
+ cat $@.fs >> $@
+ rm -rf $@.fs
+endef
+
define Build/netgear-squashfs
rm -rf $@.fs $@.squashfs
mkdir -p $@.fs/image
@@ -19,16 +29,6 @@ define Build/netgear-squashfs
rm -rf $@.squashfs $@.fs
endef
-define Build/netgear-rootfs
- mkimage \
- -A mips -O linux -T filesystem -C none \
- -M $(NETGEAR_KERNEL_MAGIC) \
- -n '$(VERSION_DIST) filesystem' \
- -d $(IMAGE_ROOTFS) $@.fs
- cat $@.fs >> $@
- rm -rf $@.fs
-endef
-
define Build/netgear-uImage
$(call Build/uImage,$(1) -M $(NETGEAR_KERNEL_MAGIC))
endef
diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk
index 5519e9c960..a38b8ef8d8 100644
--- a/target/linux/ath79/image/generic-tp-link.mk
+++ b/target/linux/ath79/image/generic-tp-link.mk
@@ -36,6 +36,17 @@ define Device/tplink_archer-c25-v1
endef
TARGET_DEVICES += tplink_archer-c25-v1
+define Device/tplink_archer-c5-v1
+ $(Device/tplink-16mlzma)
+ ATH_SOC := qca9558
+ DEVICE_MODEL := Archer C5
+ DEVICE_VARIANT := v1
+ DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
+ TPLINK_HWID := 0xc5000001
+ SUPPORTED_DEVICES += archer-c5
+endef
+TARGET_DEVICES += tplink_archer-c5-v1
+
define Device/tplink_archer-c58-v1
$(Device/tplink-safeloader-uimage)
ATH_SOC := qca9561
@@ -72,6 +83,17 @@ define Device/tplink_archer-c59-v2
endef
TARGET_DEVICES += tplink_archer-c59-v2
+define Device/tplink_archer-c6-v2
+ $(Device/tplink-safeloader-uimage)
+ ATH_SOC := qca9563
+ IMAGE_SIZE := 7808k
+ DEVICE_MODEL := Archer C6
+ DEVICE_VARIANT := v2
+ TPLINK_BOARD_ID := ARCHER-C6-V2
+ DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct
+endef
+TARGET_DEVICES += tplink_archer-c6-v2
+
define Device/tplink_archer-c60-v1
$(Device/tplink-safeloader-uimage)
ATH_SOC := qca9561
@@ -96,28 +118,6 @@ define Device/tplink_archer-c60-v2
endef
TARGET_DEVICES += tplink_archer-c60-v2
-define Device/tplink_archer-c6-v2
- $(Device/tplink-safeloader-uimage)
- ATH_SOC := qca9563
- IMAGE_SIZE := 7808k
- DEVICE_MODEL := Archer C6
- DEVICE_VARIANT := v2
- TPLINK_BOARD_ID := ARCHER-C6-V2
- DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct
-endef
-TARGET_DEVICES += tplink_archer-c6-v2
-
-define Device/tplink_archer-c5-v1
- $(Device/tplink-16mlzma)
- ATH_SOC := qca9558
- DEVICE_MODEL := Archer C5
- DEVICE_VARIANT := v1
- DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
- TPLINK_HWID := 0xc5000001
- SUPPORTED_DEVICES += archer-c5
-endef
-TARGET_DEVICES += tplink_archer-c5-v1
-
define Device/tplink_archer-c7-v1
$(Device/tplink-8mlzma)
ATH_SOC := qca9558
@@ -169,6 +169,28 @@ define Device/tplink_archer-c7-v5
endef
TARGET_DEVICES += tplink_archer-c7-v5
+define Device/tplink_archer-d50-v1
+ ATH_SOC := qca9531
+ DEVICE_VENDOR := TP-Link
+ DEVICE_MODEL := Archer D50
+ DEVICE_VARIANT := v1
+ DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
+ BOARDNAME := ARCHER-D50-V1
+ IMAGE_SIZE := 7808k
+ TPLINK_HWID := 0xC1200001
+ TPLINK_HWREV := 0x00000046
+ TPLINK_FLASHLAYOUT := 8Mqca
+ TPLINK_HWREVADD := 0x00000000
+ TPLINK_HVERSION := 3
+ KERNEL := kernel-bin | append-dtb | lzma
+ KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | \
+ tplink-v2-header -s -V "ver. 1.0"
+ IMAGES := sysupgrade.bin
+ IMAGE/sysupgrade.bin := tplink-v2-image -s -V "ver. 2.0" | \
+ append-metadata | check-size $$$$(IMAGE_SIZE)
+endef
+TARGET_DEVICES += tplink_archer-d50-v1
+
define Device/tplink_cpe210-v1
$(Device/tplink-loader-okli)
ATH_SOC := ar9344
@@ -264,28 +286,6 @@ define Device/tplink_cpe610-v1
endef
TARGET_DEVICES += tplink_cpe610-v1
-define Device/tplink_archer-d50-v1
- ATH_SOC := qca9531
- DEVICE_VENDOR := TP-Link
- DEVICE_MODEL := Archer D50
- DEVICE_VARIANT := v1
- DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
- BOARDNAME := ARCHER-D50-V1
- IMAGE_SIZE := 7808k
- TPLINK_HWID := 0xC1200001
- TPLINK_HWREV := 0x00000046
- TPLINK_FLASHLAYOUT := 8Mqca
- TPLINK_HWREVADD := 0x00000000
- TPLINK_HVERSION := 3
- KERNEL := kernel-bin | append-dtb | lzma
- KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | \
- tplink-v2-header -s -V "ver. 1.0"
- IMAGES := sysupgrade.bin
- IMAGE/sysupgrade.bin := tplink-v2-image -s -V "ver. 2.0" | \
- append-metadata | check-size $$$$(IMAGE_SIZE)
-endef
-TARGET_DEVICES += tplink_archer-d50-v1
-
define Device/tplink_re350k-v1
$(Device/tplink-safeloader)
ATH_SOC := qca9558
@@ -383,68 +383,6 @@ define Device/tplink_tl-wdr4900-v2
endef
TARGET_DEVICES += tplink_tl-wdr4900-v2
-define Device/tplink_tl-wr810n-v1
- $(Device/tplink-8mlzma)
- ATH_SOC := qca9531
- DEVICE_MODEL := TL-WR810N
- DEVICE_VARIANT := v1
- TPLINK_HWID := 0x8100001
- DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
-endef
-TARGET_DEVICES += tplink_tl-wr810n-v1
-
-define Device/tplink_tl-wr810n-v2
- $(Device/tplink-8mlzma)
- ATH_SOC := qca9533
- DEVICE_MODEL := TL-WR810N
- DEVICE_VARIANT := v2
- TPLINK_HWID := 0x8100002
-endef
-TARGET_DEVICES += tplink_tl-wr810n-v2
-
-define Device/tplink_tl-wr710n-v1
- $(Device/tplink-8mlzma)
- ATH_SOC := ar9331
- DEVICE_MODEL := TL-WR710N
- DEVICE_VARIANT := v1
- DEVICE_PACKAGES := kmod-usb-core kmod-usb-chipidea2 kmod-usb-ledtrig-usbport
- TPLINK_HWID := 0x07100001
- SUPPORTED_DEVICES += tl-wr710n
-endef
-TARGET_DEVICES += tplink_tl-wr710n-v1
-
-define Device/tplink_tl-wr842n-v1
- $(Device/tplink-8m)
- ATH_SOC := ar7241
- DEVICE_MODEL := TL-WR842N/ND
- DEVICE_VARIANT := v1
- DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
- TPLINK_HWID := 0x8420001
-endef
-TARGET_DEVICES += tplink_tl-wr842n-v1
-
-define Device/tplink_tl-wr842n-v2
- $(Device/tplink-8mlzma)
- ATH_SOC := ar9341
- DEVICE_MODEL := TL-WR842N/ND
- DEVICE_VARIANT := v2
- DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
- TPLINK_HWID := 0x8420002
- SUPPORTED_DEVICES += tl-wr842n-v2
-endef
-TARGET_DEVICES += tplink_tl-wr842n-v2
-
-define Device/tplink_tl-wr842n-v3
- $(Device/tplink-16mlzma)
- ATH_SOC := qca9533
- DEVICE_MODEL := TL-WR842N
- DEVICE_VARIANT := v3
- DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
- TPLINK_HWID := 0x8420003
- SUPPORTED_DEVICES += tl-wr842n-v3
-endef
-TARGET_DEVICES += tplink_tl-wr842n-v3
-
define Device/tplink_tl-wr1043nd-v1
$(Device/tplink-8m)
ATH_SOC := ar9132
@@ -515,3 +453,65 @@ define Device/tplink_tl-wr2543-v1
SUPPORTED_DEVICES += tl-wr2543-v1
endef
TARGET_DEVICES += tplink_tl-wr2543-v1
+
+define Device/tplink_tl-wr710n-v1
+ $(Device/tplink-8mlzma)
+ ATH_SOC := ar9331
+ DEVICE_MODEL := TL-WR710N
+ DEVICE_VARIANT := v1
+ DEVICE_PACKAGES := kmod-usb-core kmod-usb-chipidea2 kmod-usb-ledtrig-usbport
+ TPLINK_HWID := 0x07100001
+ SUPPORTED_DEVICES += tl-wr710n
+endef
+TARGET_DEVICES += tplink_tl-wr710n-v1
+
+define Device/tplink_tl-wr810n-v1
+ $(Device/tplink-8mlzma)
+ ATH_SOC := qca9531
+ DEVICE_MODEL := TL-WR810N
+ DEVICE_VARIANT := v1
+ TPLINK_HWID := 0x8100001
+ DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
+endef
+TARGET_DEVICES += tplink_tl-wr810n-v1
+
+define Device/tplink_tl-wr810n-v2
+ $(Device/tplink-8mlzma)
+ ATH_SOC := qca9533
+ DEVICE_MODEL := TL-WR810N
+ DEVICE_VARIANT := v2
+ TPLINK_HWID := 0x8100002
+endef
+TARGET_DEVICES += tplink_tl-wr810n-v2
+
+define Device/tplink_tl-wr842n-v1
+ $(Device/tplink-8m)
+ ATH_SOC := ar7241
+ DEVICE_MODEL := TL-WR842N/ND
+ DEVICE_VARIANT := v1
+ DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
+ TPLINK_HWID := 0x8420001
+endef
+TARGET_DEVICES += tplink_tl-wr842n-v1
+
+define Device/tplink_tl-wr842n-v2
+ $(Device/tplink-8mlzma)
+ ATH_SOC := ar9341
+ DEVICE_MODEL := TL-WR842N/ND
+ DEVICE_VARIANT := v2
+ DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
+ TPLINK_HWID := 0x8420002
+ SUPPORTED_DEVICES += tl-wr842n-v2
+endef
+TARGET_DEVICES += tplink_tl-wr842n-v2
+
+define Device/tplink_tl-wr842n-v3
+ $(Device/tplink-16mlzma)
+ ATH_SOC := qca9533
+ DEVICE_MODEL := TL-WR842N
+ DEVICE_VARIANT := v3
+ DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
+ TPLINK_HWID := 0x8420003
+ SUPPORTED_DEVICES += tl-wr842n-v3
+endef
+TARGET_DEVICES += tplink_tl-wr842n-v3
diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk
index 0548f0a587..4b2cee215c 100644
--- a/target/linux/ath79/image/generic-ubnt.mk
+++ b/target/linux/ath79/image/generic-ubnt.mk
@@ -44,16 +44,6 @@ define Device/ubnt
append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | mkubntimage-split
endef
-define Device/ubnt-xm
- $(Device/ubnt)
- DEVICE_VARIANT := XM
- DEVICE_PACKAGES += kmod-usb-ohci rssileds
- UBNT_TYPE := XM
- UBNT_CHIP := ar7240
- ATH_SOC := ar7241
- KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma | uImage lzma
-endef
-
define Device/ubnt-bz
$(Device/ubnt)
UBNT_TYPE := BZ
@@ -70,6 +60,16 @@ define Device/ubnt-wa
ATH_SOC := ar9342
endef
+define Device/ubnt-xm
+ $(Device/ubnt)
+ DEVICE_VARIANT := XM
+ DEVICE_PACKAGES += kmod-usb-ohci rssileds
+ UBNT_TYPE := XM
+ UBNT_CHIP := ar7240
+ ATH_SOC := ar7241
+ KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma | uImage lzma
+endef
+
define Device/ubnt-xw
$(Device/ubnt)
DEVICE_VARIANT := XW
@@ -81,6 +81,18 @@ define Device/ubnt-xw
ATH_SOC := ar9342
endef
+define Device/ubnt_acb-isp
+ $(Device/ubnt)
+ ATH_SOC := qca9533
+ IMAGE_SIZE := 15744k
+ DEVICE_MODEL := airCube ISP
+ UBNT_BOARD := ACB-ISP
+ UBNT_TYPE := ACB
+ UBNT_CHIP := qca9533
+ IMAGES := sysupgrade.bin
+endef
+TARGET_DEVICES += ubnt_acb-isp
+
define Device/ubnt_airrouter
$(Device/ubnt-xm)
DEVICE_MODEL := AirRouter
@@ -102,27 +114,6 @@ define Device/ubnt_bullet-m-xw
endef
TARGET_DEVICES += ubnt_bullet-m-xw
-define Device/ubnt_rocket-m
- $(Device/ubnt-xm)
- DEVICE_MODEL := Rocket-M
- SUPPORTED_DEVICES += rocket-m
-endef
-TARGET_DEVICES += ubnt_rocket-m
-
-define Device/ubnt_nanostation-m
- $(Device/ubnt-xm)
- DEVICE_MODEL := Nanostation M
- SUPPORTED_DEVICES += nano-m
-endef
-TARGET_DEVICES += ubnt_nanostation-m
-
-define Device/ubnt_nanostation-m-xw
- $(Device/ubnt-xw)
- DEVICE_MODEL := Nanostation M
- SUPPORTED_DEVICES += nanostation-m-xw
-endef
-TARGET_DEVICES += ubnt_nanostation-m-xw
-
define Device/ubnt_lap-120
$(Device/ubnt-wa)
DEVICE_MODEL := LiteAP ac
@@ -160,6 +151,59 @@ define Device/ubnt_nanostation-ac-loco
endef
TARGET_DEVICES += ubnt_nanostation-ac-loco
+define Device/ubnt_nanostation-m
+ $(Device/ubnt-xm)
+ DEVICE_MODEL := Nanostation M
+ SUPPORTED_DEVICES += nano-m
+endef
+TARGET_DEVICES += ubnt_nanostation-m
+
+define Device/ubnt_nanostation-m-xw
+ $(Device/ubnt-xw)
+ DEVICE_MODEL := Nanostation M
+ SUPPORTED_DEVICES += nanostation-m-xw
+endef
+TARGET_DEVICES += ubnt_nanostation-m-xw
+
+define Device/ubnt_rocket-m
+ $(Device/ubnt-xm)
+ DEVICE_MODEL := Rocket-M
+ SUPPORTED_DEVICES += rocket-m
+endef
+TARGET_DEVICES += ubnt_rocket-m
+
+define Device/ubnt_routerstation_common
+ DEVICE_PACKAGES := -kmod-ath9k -wpad-mini -uboot-envtools kmod-usb-ohci kmod-usb2 fconfig
+ DEVICE_VENDOR := Ubiquiti
+ ATH_SOC := ar7161
+ IMAGE_SIZE := 16128k
+ IMAGES := factory.bin
+ IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | check-size $$$$(IMAGE_SIZE)
+ KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE)
+ KERNEL_INITRAMFS := kernel-bin | append-dtb
+endef
+
+define Device/ubnt_routerstation
+ $(Device/ubnt_routerstation_common)
+ DEVICE_MODEL := RouterStation
+ UBNT_BOARD := RS
+ UBNT_TYPE := RSx
+ UBNT_CHIP := ar7100
+ DEVICE_PACKAGES += -swconfig
+ SUPPORTED_DEVICES += routerstation
+endef
+TARGET_DEVICES += ubnt_routerstation
+
+define Device/ubnt_routerstation-pro
+ $(Device/ubnt_routerstation_common)
+ DEVICE_MODEL := RouterStation Pro
+ UBNT_BOARD := RSPRO
+ UBNT_TYPE := RSPRO
+ UBNT_CHIP := ar7100pro
+ SUPPORTED_DEVICES += routerstation-pro
+endef
+TARGET_DEVICES += ubnt_routerstation-pro
+
define Device/ubnt_unifi
$(Device/ubnt-bz)
DEVICE_MODEL := UniFi
@@ -202,47 +246,3 @@ define Device/ubnt_unifiac-pro
SUPPORTED_DEVICES += ubnt-unifiac-pro
endef
TARGET_DEVICES += ubnt_unifiac-pro
-
-define Device/ubnt_routerstation_common
- DEVICE_PACKAGES := -kmod-ath9k -wpad-mini -uboot-envtools kmod-usb-ohci kmod-usb2 fconfig
- DEVICE_VENDOR := Ubiquiti
- ATH_SOC := ar7161
- IMAGE_SIZE := 16128k
- IMAGES := factory.bin
- IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | check-size $$$$(IMAGE_SIZE)
- KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE)
- KERNEL_INITRAMFS := kernel-bin | append-dtb
-endef
-
-define Device/ubnt_routerstation
- $(Device/ubnt_routerstation_common)
- DEVICE_MODEL := RouterStation
- UBNT_BOARD := RS
- UBNT_TYPE := RSx
- UBNT_CHIP := ar7100
- DEVICE_PACKAGES += -swconfig
- SUPPORTED_DEVICES += routerstation
-endef
-TARGET_DEVICES += ubnt_routerstation
-
-define Device/ubnt_routerstation-pro
- $(Device/ubnt_routerstation_common)
- DEVICE_MODEL := RouterStation Pro
- UBNT_BOARD := RSPRO
- UBNT_TYPE := RSPRO
- UBNT_CHIP := ar7100pro
- SUPPORTED_DEVICES += routerstation-pro
-endef
-TARGET_DEVICES += ubnt_routerstation-pro
-
-define Device/ubnt_acb-isp
- $(Device/ubnt)
- ATH_SOC := qca9533
- IMAGE_SIZE := 15744k
- DEVICE_MODEL := airCube ISP
- UBNT_BOARD := ACB-ISP
- UBNT_TYPE := ACB
- UBNT_CHIP := qca9533
- IMAGES := sysupgrade.bin
-endef
-TARGET_DEVICES += ubnt_acb-isp
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index dffb4bf577..e1304a2166 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -6,21 +6,6 @@ DEVICE_VARS += ADDPATTERN_ID ADDPATTERN_VERSION
DEVICE_VARS += SEAMA_SIGNATURE SEAMA_MTDBLOCK
DEVICE_VARS += KERNEL_INITRAMFS_PREFIX
-define Build/cybertan-trx
- @echo -n '' > $@-empty.bin
- -$(STAGING_DIR_HOST)/bin/trx -o $@.new \
- -f $(IMAGE_KERNEL) -F $@-empty.bin \
- -x 32 -a 0x10000 -x -32 -f $@
- -mv "$@.new" "$@"
- -rm $@-empty.bin
-endef
-
-define Build/addpattern
- -$(STAGING_DIR_HOST)/bin/addpattern -B $(ADDPATTERN_ID) \
- -v v$(ADDPATTERN_VERSION) -i $@ -o $@.new
- -mv "$@.new" "$@"
-endef
-
define Build/add-elecom-factory-initramfs
$(eval edimax_model=$(word 1,$(1)))
$(eval product=$(word 2,$(1)))
@@ -43,6 +28,21 @@ define Build/add-elecom-factory-initramfs
fi
endef
+define Build/addpattern
+ -$(STAGING_DIR_HOST)/bin/addpattern -B $(ADDPATTERN_ID) \
+ -v v$(ADDPATTERN_VERSION) -i $@ -o $@.new
+ -mv "$@.new" "$@"
+endef
+
+define Build/cybertan-trx
+ @echo -n '' > $@-empty.bin
+ -$(STAGING_DIR_HOST)/bin/trx -o $@.new \
+ -f $(IMAGE_KERNEL) -F $@-empty.bin \
+ -x 32 -a 0x10000 -x -32 -f $@
+ -mv "$@.new" "$@"
+ -rm $@-empty.bin
+endef
+
define Build/nec-enc
$(STAGING_DIR_HOST)/bin/nec-enc \
-i $@ -o $@.new -k $(1)
@@ -88,6 +88,7 @@ define Device/seama
SEAMA_SIGNATURE :=
endef
+
define Device/8dev_carambola2
ATH_SOC := ar9331
DEVICE_VENDOR := 8devices
@@ -395,19 +396,6 @@ define Device/dlink_dir-835-a1
endef
TARGET_DEVICES += dlink_dir-835-a1
-define Device/dlink_dir-859-a1
- $(Device/seama)
- ATH_SOC := qca9563
- DEVICE_VENDOR := D-Link
- DEVICE_MODEL := DIR-859
- DEVICE_VARIANT := A1
- IMAGE_SIZE := 15872k
- DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct
- SEAMA_SIGNATURE := wrgac37_dlink.2013gui_dir859
- SUPPORTED_DEVICES += dir-859-a1
-endef
-TARGET_DEVICES += dlink_dir-859-a1
-
define Device/dlink_dir-842-c
ATH_SOC := qca9563
DEVICE_VENDOR := D-Link
@@ -449,6 +437,19 @@ define Device/dlink_dir-842-c3
endef
TARGET_DEVICES += dlink_dir-842-c3
+define Device/dlink_dir-859-a1
+ $(Device/seama)
+ ATH_SOC := qca9563
+ DEVICE_VENDOR := D-Link
+ DEVICE_MODEL := DIR-859
+ DEVICE_VARIANT := A1
+ IMAGE_SIZE := 15872k
+ DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct
+ SEAMA_SIGNATURE := wrgac37_dlink.2013gui_dir859
+ SUPPORTED_DEVICES += dir-859-a1
+endef
+TARGET_DEVICES += dlink_dir-859-a1
+
define Device/elecom_wrc-1750ghbk2-i
ATH_SOC := qca9563
DEVICE_VENDOR := ELECOM
@@ -706,6 +707,72 @@ define Device/nec_wg800hp
endef
TARGET_DEVICES += nec_wg800hp
+define Device/netgear_ex6400_ex7300
+ ATH_SOC := qca9558
+ NETGEAR_KERNEL_MAGIC := 0x27051956
+ NETGEAR_BOARD_ID := EX7300series
+ NETGEAR_HW_ID := 29765104+16+0+128
+ IMAGE_SIZE := 15552k
+ IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | netgear-rootfs | pad-rootfs
+ DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca99x0-ct
+ $(Device/netgear_ath79)
+endef
+
+define Device/netgear_ex6400
+ $(Device/netgear_ex6400_ex7300)
+ DEVICE_MODEL := EX6400
+endef
+TARGET_DEVICES += netgear_ex6400
+
+define Device/netgear_ex7300
+ $(Device/netgear_ex6400_ex7300)
+ DEVICE_MODEL := EX7300
+endef
+TARGET_DEVICES += netgear_ex7300
+
+define Device/netgear_wndr3x00
+ ATH_SOC := ar7161
+ IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs
+ 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
+ $(Device/netgear_wndr3x00)
+ DEVICE_MODEL := WNDR3700
+ DEVICE_VARIANT := v1
+ NETGEAR_KERNEL_MAGIC := 0x33373030
+ NETGEAR_BOARD_ID := WNDR3700
+ IMAGE_SIZE := 7680k
+ IMAGES += factory-NA.img
+ IMAGE/factory-NA.img := $$(IMAGE/default) | netgear-dni NA | check-size $$$$(IMAGE_SIZE)
+ SUPPORTED_DEVICES += wndr3700
+endef
+TARGET_DEVICES += netgear_wndr3700
+
+define Device/netgear_wndr3700v2
+ $(Device/netgear_wndr3x00)
+ DEVICE_MODEL := WNDR3700
+ DEVICE_VARIANT := v2
+ NETGEAR_KERNEL_MAGIC := 0x33373031
+ NETGEAR_BOARD_ID := WNDR3700v2
+ NETGEAR_HW_ID := 29763654+16+64
+ IMAGE_SIZE := 15872k
+ SUPPORTED_DEVICES += wndr3700v2
+endef
+TARGET_DEVICES += netgear_wndr3700v2
+
+define Device/netgear_wndr3800
+ $(Device/netgear_wndr3x00)
+ DEVICE_MODEL := WNDR3800
+ NETGEAR_KERNEL_MAGIC := 0x33373031
+ NETGEAR_BOARD_ID := WNDR3800
+ NETGEAR_HW_ID := 29763654+16+128
+ IMAGE_SIZE := 15872k
+ SUPPORTED_DEVICES += wndr3800
+endef
+TARGET_DEVICES += netgear_wndr3800
+
define Device/ocedo_koala
ATH_SOC := qca9558
DEVICE_VENDOR := Ocedo
@@ -775,60 +842,15 @@ define Device/pcs_cr5000
endef
TARGET_DEVICES += pcs_cr5000
-define Device/netgear_wndr3x00
- ATH_SOC := ar7161
- IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs
- 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_ex7300_ex6400
- ATH_SOC := qca9558
- NETGEAR_KERNEL_MAGIC := 0x27051956
- NETGEAR_BOARD_ID := EX7300series
- NETGEAR_HW_ID := 29765104+16+0+128
- IMAGE_SIZE := 15552k
- IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | netgear-rootfs | pad-rootfs
- DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca99x0-ct
- $(Device/netgear_ath79)
-endef
-
-define Device/netgear_ex6400
- $(Device/netgear_ex7300_ex6400)
- DEVICE_MODEL := EX6400
-endef
-TARGET_DEVICES += netgear_ex6400
-
-define Device/netgear_ex7300
- $(Device/netgear_ex7300_ex6400)
- DEVICE_MODEL := EX7300
-endef
-TARGET_DEVICES += netgear_ex7300
-
-define Device/netgear_wndr3700
- $(Device/netgear_wndr3x00)
- DEVICE_MODEL := WNDR3700
- DEVICE_VARIANT := v1
- NETGEAR_KERNEL_MAGIC := 0x33373030
- NETGEAR_BOARD_ID := WNDR3700
- IMAGE_SIZE := 7680k
- IMAGES += factory-NA.img
- IMAGE/factory-NA.img := $$(IMAGE/default) | netgear-dni NA | check-size $$$$(IMAGE_SIZE)
- SUPPORTED_DEVICES += wndr3700
-endef
-TARGET_DEVICES += netgear_wndr3700
-
-define Device/netgear_wndr3700v2
- $(Device/netgear_wndr3x00)
- DEVICE_MODEL := WNDR3700
- DEVICE_VARIANT := v2
- NETGEAR_KERNEL_MAGIC := 0x33373031
- NETGEAR_BOARD_ID := WNDR3700v2
- NETGEAR_HW_ID := 29763654+16+64
- IMAGE_SIZE := 15872k
- SUPPORTED_DEVICES += wndr3700v2
+define Device/phicomm_k2t
+ ATH_SOC := qca9563
+ DEVICE_VENDOR := Phicomm
+ DEVICE_MODEL := K2T
+ IMAGE_SIZE := 15744k
+ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
+ DEVICE_PACKAGES := kmod-leds-reset kmod-ath10k-ct ath10k-firmware-qca9888-ct
endef
-TARGET_DEVICES += netgear_wndr3700v2
+TARGET_DEVICES += phicomm_k2t
define Device/pisen_ts-d084
$(Device/tplink-8mlzma)
@@ -867,27 +889,6 @@ define Device/pisen_wmm003n
endef
TARGET_DEVICES += pisen_wmm003n
-define Device/netgear_wndr3800
- $(Device/netgear_wndr3x00)
- DEVICE_MODEL := WNDR3800
- NETGEAR_KERNEL_MAGIC := 0x33373031
- NETGEAR_BOARD_ID := WNDR3800
- NETGEAR_HW_ID := 29763654+16+128
- IMAGE_SIZE := 15872k
- SUPPORTED_DEVICES += wndr3800
-endef
-TARGET_DEVICES += netgear_wndr3800
-
-define Device/phicomm_k2t
- ATH_SOC := qca9563
- DEVICE_VENDOR := Phicomm
- DEVICE_MODEL := K2T
- IMAGE_SIZE := 15744k
- IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
- DEVICE_PACKAGES := kmod-leds-reset kmod-ath10k-ct ath10k-firmware-qca9888-ct
-endef
-TARGET_DEVICES += phicomm_k2t
-
define Device/qihoo_c301
$(Device/seama)
ATH_SOC := ar9344
diff --git a/target/linux/ath79/image/tiny-tp-link.mk b/target/linux/ath79/image/tiny-tp-link.mk
index 71d165fdc2..c1d29f5b81 100644
--- a/target/linux/ath79/image/tiny-tp-link.mk
+++ b/target/linux/ath79/image/tiny-tp-link.mk
@@ -1,6 +1,5 @@
include ./common-tp-link.mk
-
define Device/tplink_tl-mr10u
$(Device/tplink-4mlzma)
ATH_SOC := ar9331