aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-09-13 14:48:26 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-09-16 17:31:03 +0200
commitc68105c3b4f616931444174ff6d893c8fbaf9465 (patch)
treeb7a7d5d7f4d7dfd5366c0695f11f11e755771ec0 /target
parenta99614a44f205f48db4278988566d2b6b2b96295 (diff)
downloadupstream-c68105c3b4f616931444174ff6d893c8fbaf9465.tar.gz
upstream-c68105c3b4f616931444174ff6d893c8fbaf9465.tar.bz2
upstream-c68105c3b4f616931444174ff6d893c8fbaf9465.zip
ath79: use common device definition for Buffalo devices
The Buffalo devices in ath79 share their image generation code, so let's create a shared Device definition for them. Since most of them use BUFFALO_HWVER := 3, this is moved as default to the shared definition as well. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target')
-rw-r--r--target/linux/ath79/image/common-buffalo.mk15
-rw-r--r--target/linux/ath79/image/generic.mk39
-rw-r--r--target/linux/ath79/image/tiny.mk9
3 files changed, 27 insertions, 36 deletions
diff --git a/target/linux/ath79/image/common-buffalo.mk b/target/linux/ath79/image/common-buffalo.mk
index d62b7eea94..31936b8234 100644
--- a/target/linux/ath79/image/common-buffalo.mk
+++ b/target/linux/ath79/image/common-buffalo.mk
@@ -1,3 +1,5 @@
+DEVICE_VARS += BUFFALO_PRODUCT BUFFALO_HWVER
+
define Build/buffalo-tag
$(eval product=$(word 1,$(1)))
$(eval hwver=$(word 2,$(1)))
@@ -17,3 +19,16 @@ define Build/buffalo-tftp-header
) > $@.new
mv $@.new $@
endef
+
+
+define Device/buffalo_common
+ DEVICE_VENDOR := Buffalo
+ BUFFALO_PRODUCT :=
+ BUFFALO_HWVER := 3
+ IMAGES += factory.bin tftp.bin
+ IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \
+ pad-rootfs | check-size
+ IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc $$$$(BUFFALO_PRODUCT) 1.99 | \
+ buffalo-tag $$$$(BUFFALO_PRODUCT) $$$$(BUFFALO_HWVER)
+ IMAGE/tftp.bin := $$(IMAGE/default) | buffalo-tftp-header
+endef
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index 7a00bae287..4b6cdaa826 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -315,17 +315,12 @@ endef
TARGET_DEVICES += avm_fritzdvbc
define Device/buffalo_bhr-4grv
+ $(Device/buffalo_common)
SOC := ar7242
- DEVICE_VENDOR := Buffalo
DEVICE_MODEL := BHR-4GRV
+ BUFFALO_PRODUCT := BHR-4GRV
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
IMAGE_SIZE := 32256k
- IMAGES += factory.bin tftp.bin
- IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \
- pad-rootfs | check-size
- IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc BHR-4GRV 1.99 | \
- buffalo-tag BHR-4GRV 3
- IMAGE/tftp.bin := $$(IMAGE/default) | buffalo-tftp-header
SUPPORTED_DEVICES += wzr-hp-g450h
endef
TARGET_DEVICES += buffalo_bhr-4grv
@@ -339,51 +334,37 @@ endef
TARGET_DEVICES += buffalo_bhr-4grv2
define Device/buffalo_wzr-hp-ag300h
+ $(Device/buffalo_common)
SOC := ar7161
- DEVICE_VENDOR := Buffalo
DEVICE_MODEL := WZR-HP-AG300H
- IMAGE_SIZE := 32320k
- IMAGES += factory.bin tftp.bin
- IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \
- pad-rootfs | check-size
- IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WZR-HP-AG300H 1.99 | \
- buffalo-tag WZR-HP-AG300H 3
- IMAGE/tftp.bin := $$(IMAGE/default) | buffalo-tftp-header
+ BUFFALO_PRODUCT := WZR-HP-AG300H
DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
kmod-leds-reset kmod-owl-loader
+ IMAGE_SIZE := 32320k
SUPPORTED_DEVICES += wzr-hp-ag300h
endef
TARGET_DEVICES += buffalo_wzr-hp-ag300h
define Device/buffalo_wzr-hp-g302h-a1a0
+ $(Device/buffalo_common)
SOC := ar7242
- DEVICE_VENDOR := Buffalo
DEVICE_MODEL := WZR-HP-G302H
DEVICE_VARIANT := A1A0
+ BUFFALO_PRODUCT := WZR-HP-G302H
+ BUFFALO_HWVER := 4
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
IMAGE_SIZE := 32128k
- IMAGES += factory.bin tftp.bin
- IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \
- pad-rootfs | check-size
- IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WZR-HP-G302H 1.99 | \
- buffalo-tag WZR-HP-G302H 4
- IMAGE/tftp.bin := $$(IMAGE/default) | buffalo-tftp-header
SUPPORTED_DEVICES += wzr-hp-g300nh2
endef
TARGET_DEVICES += buffalo_wzr-hp-g302h-a1a0
define Device/buffalo_wzr-hp-g450h
+ $(Device/buffalo_common)
SOC := ar7242
- DEVICE_VENDOR := Buffalo
DEVICE_MODEL := WZR-HP-G450H/WZR-450HP
+ BUFFALO_PRODUCT := WZR-HP-G450H
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
IMAGE_SIZE := 32256k
- IMAGES += factory.bin tftp.bin
- IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \
- pad-rootfs | check-size
- IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WZR-HP-G450H 1.99 | \
- buffalo-tag WZR-HP-G450H 3
- IMAGE/tftp.bin := $$(IMAGE/default) | buffalo-tftp-header
SUPPORTED_DEVICES += wzr-hp-g450h
endef
TARGET_DEVICES += buffalo_wzr-hp-g450h
diff --git a/target/linux/ath79/image/tiny.mk b/target/linux/ath79/image/tiny.mk
index 9f4f89bd9a..83c34d718b 100644
--- a/target/linux/ath79/image/tiny.mk
+++ b/target/linux/ath79/image/tiny.mk
@@ -1,16 +1,11 @@
include ./common-buffalo.mk
define Device/buffalo_whr-g301n
+ $(Device/buffalo_common)
SOC := ar7240
- DEVICE_VENDOR := Buffalo
DEVICE_MODEL := WHR-G301N
+ BUFFALO_PRODUCT := WHR-G301N
IMAGE_SIZE := 3712k
- IMAGES += factory.bin tftp.bin
- IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \
- pad-rootfs | check-size
- IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WHR-G301N 1.99 | \
- buffalo-tag WHR-G301N 3
- IMAGE/tftp.bin := $$(IMAGE/default) | buffalo-tftp-header
SUPPORTED_DEVICES += whr-g301n
DEFAULT := n
endef