From d745eac636f017d8a6ac2091746c985fcd8d2851 Mon Sep 17 00:00:00 2001 From: INAGAKI Hiroshi Date: Sun, 7 Oct 2018 20:37:42 +0900 Subject: [PATCH] ath79: add hwver parameter to buffalo-tag In order to be able to set the value of "hardware version" other than "3", I added the "hwver" parameter. Signed-off-by: INAGAKI Hiroshi --- target/linux/ath79/image/common-buffalo.mk | 3 ++- target/linux/ath79/image/generic.mk | 6 +++--- target/linux/ath79/image/tiny.mk | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/target/linux/ath79/image/common-buffalo.mk b/target/linux/ath79/image/common-buffalo.mk index a756f8448b..8870af691e 100644 --- a/target/linux/ath79/image/common-buffalo.mk +++ b/target/linux/ath79/image/common-buffalo.mk @@ -8,8 +8,9 @@ endef define Build/buffalo-tag $(eval product=$(word 1,$(1))) + $(eval hwver=$(word 2,$(1))) $(STAGING_DIR_HOST)/bin/buffalo-tag \ - -c 0x80041000 -d 0x801e8000 -w 3 \ + -c 0x80041000 -d 0x801e8000 -w $(hwver) \ -a ath -v 1.99 -m 1.01 -f 1 \ -b $(product) -p $(product) \ -r M_ -l mlang8 \ diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 39f59524d9..80ec2311b4 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -76,7 +76,7 @@ define Device/buffalo_bhr-4grv IMAGE_SIZE := 32256k IMAGES += factory.bin tftp.bin IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc BHR-4GRV 1.99 | buffalo-tag BHR-4GRV + 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 @@ -88,7 +88,7 @@ define Device/buffalo_wzr-hp-ag300h IMAGE_SIZE := 32256k IMAGES += factory.bin tftp.bin IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WZR-HP-AG300H 1.99 | buffalo-tag WZR-HP-AG300H + 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 DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport kmod-leds-reset kmod-owl-loader SUPPORTED_DEVICES += wzr-hp-ag300h @@ -102,7 +102,7 @@ define Device/buffalo_wzr-hp-g450h IMAGE_SIZE := 32256k IMAGES += factory.bin tftp.bin IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WZR-HP-G450H 1.99 | buffalo-tag WZR-HP-G450H + 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 diff --git a/target/linux/ath79/image/tiny.mk b/target/linux/ath79/image/tiny.mk index 531a7f30c2..bc738c2f77 100644 --- a/target/linux/ath79/image/tiny.mk +++ b/target/linux/ath79/image/tiny.mk @@ -25,7 +25,7 @@ define Device/buffalo_whr-g301n IMAGE_SIZE := 3712k IMAGES += factory.bin tftp.bin IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WHR-G301N 1.99 | buffalo-tag WHR-G301N + 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 endef