From patchwork Sat Jul 18 10:10:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "L. D. Pinney" X-Patchwork-Id: 497369 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AF29F140D4E for ; Sat, 18 Jul 2015 20:12:42 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=0734k2kO; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 1C77628419F; Sat, 18 Jul 2015 12:12:11 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id AD489280123 for ; Sat, 18 Jul 2015 12:12:04 +0200 (CEST) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-ob0-f171.google.com (mail-ob0-f171.google.com [209.85.214.171]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sat, 18 Jul 2015 12:12:04 +0200 (CEST) Received: by obbop1 with SMTP id op1so78448824obb.2 for ; Sat, 18 Jul 2015 03:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=J6T2PTpyf+AqaH50wdBeazs0QxxknwCA9b2QY3izpLE=; b=0734k2kOSfovd06hy+Ld62dtjILdieL5n1Dpqumdyz3sBaCFIN1vB3Ku901vH5zFho 9skAJySlhqPdc0PbkqmCcCjOjf6ScEylFeZb6RsogK36Xp+plvs84mcatXU+yMeMD0tD oAYhfhpe2MbY61sbEnR6QReiPSyQFkKzUE0tWQKSfuOrDoyteX0CE2bGyiNtIMJbs6m8 T62MN4N51OUzHI95Te3fwnKa1eN8j3FYJjBtAVIH8VSdvr979IIVJrNS89kHHk3y4y7i KqK8MKHvRfdPW1rsd1qjSXbhnc8RswmxQvhWU/52ZBu3S1GlDiWC5iLHVlrlo1LY5Muk ateA== X-Received: by 10.60.56.35 with SMTP id x3mr1491485oep.65.1437214347677; Sat, 18 Jul 2015 03:12:27 -0700 (PDT) Received: from black.lan (ip70-185-197-240.ok.ok.cox.net. [70.185.197.240]) by smtp.gmail.com with ESMTPSA id x7sm7831109obp.22.2015.07.18.03.12.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 18 Jul 2015 03:12:27 -0700 (PDT) From: "L. D. Pinney" To: OpenWrt Development List Date: Sat, 18 Jul 2015 05:10:58 -0500 Message-Id: <1437214258-10727-1-git-send-email-ldpinney@gmail.com> X-Mailer: git-send-email 2.1.4 Subject: [OpenWrt-Devel] [PATCH] CC : ar71xx: Backport Support for the Bitmain Antminer S3 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Backport of r46236 to CC : add support for the Bitmain Antminer S3 Signed-off-by: L. D. Pinney --- target/linux/ar71xx/base-files/etc/diag.sh | 3 +- target/linux/ar71xx/base-files/etc/uci-defaults/01_leds | 6 ++++ target/linux/ar71xx/base-files/etc/uci-defaults/02_network | 1 + target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 ++ target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 2 ++ target/linux/ar71xx/config-3.18 | 1 + target/linux/ar71xx/files/arch/mips/ath79/mach-antminer-s3.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ target/linux/ar71xx/generic/profiles/antminer.mk | 11 +++++++ target/linux/ar71xx/image/Makefile | 10 ++++++- target/linux/ar71xx/patches-3.18/905-MIPS-ath79-bitmain-antminer-s3-support.patch | 39 ++++++++++++++++++++++++ tools/firmware-utils/src/mktplinkfw.c | 1 + 11 files changed, 173 insertions(+), 2 deletions(-) diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 4bdb53d..843e709 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -12,7 +12,8 @@ get_status_led() { all0305) status_led="eap7660d:green:ds4" ;; - antminer-s1) + antminer-s1|\ + antminer-s3) status_led="bitmain:green:system" ;; ap132) diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds index 19814f4..5126497 100644 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds @@ -36,6 +36,12 @@ antminer-s1) ucidef_set_led_wlan "wlan" "WLAN" "bitmain:green:wlan" "phy0tpt" ;; +antminer-s3) + ucidef_set_led_wlan "wlan" "WLAN" "bitmain:green:wlan" "phy0tpt" + ucidef_set_led_default "sys" "SYS" "bitmain:green:sys" "0" + ucidef_set_led_default "lan" "LAN" "bitmain:yellow:lan" "0" + ;; + ap113) ucidef_set_led_usbdev "usb" "USB" "ap113:green:usb" "1-1" ;; diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network index 4fe951e..ea5ba91 100644 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network @@ -344,6 +344,7 @@ wp543) ;; antminer-s1 |\ +antminer-s3 |\ dir-505-a1) ucidef_set_interface_lan "eth1" ;; diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 8f4bb40..1aa90fe 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -110,6 +110,9 @@ tplink_board_detect() { "04440001"*) model="BITMAIN ANTMINER S1" ;; + "04440003"*) + model="BITMAIN ANTMINER S3" + ;; "120000"*) model="MERCURY MAC1200R" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index ade47fb..da4c9fa 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -299,6 +299,8 @@ platform_check_image() { return 1 ;; + antminer-s1 | \ + antminer-s3 | \ archer-c5 | \ archer-c7 | \ el-m150 | \ diff --git a/target/linux/ar71xx/config-3.18 b/target/linux/ar71xx/config-3.18 index 05c98eb..b051c90 100644 --- a/target/linux/ar71xx/config-3.18 +++ b/target/linux/ar71xx/config-3.18 @@ -41,6 +41,7 @@ CONFIG_ATH79_MACH_AP96=y CONFIG_ATH79_MACH_ARCHER_C7=y CONFIG_ATH79_MACH_AW_NR580=y CONFIG_ATH79_MACH_ANTMINER_S1=y +CONFIG_ATH79_MACH_ANTMINER_S3=y CONFIG_ATH79_MACH_BHU_BXU2000N2_A=y CONFIG_ATH79_MACH_CAP4200AG=y CONFIG_ATH79_MACH_CARAMBOLA2=y diff --git a/target/linux/ar71xx/generic/profiles/antminer.mk b/target/linux/ar71xx/generic/profiles/antminer.mk index 366982c..404133b 100644 --- a/target/linux/ar71xx/generic/profiles/antminer.mk +++ b/target/linux/ar71xx/generic/profiles/antminer.mk @@ -15,3 +15,14 @@ define Profile/ANTMINER_S1/Description Package set optimized for the Bitmain Antminer S1. endef $(eval $(call Profile,ANTMINER_S1)) + +define Profile/ANTMINER_S3 + NAME:=Antminer S3 + PACKAGES:=kmod-usb-core kmod-usb2 kmod-crypto-manager kmod-i2c-gpio-custom kmod-usb-hid +endef + + +define Profile/ANTMINER_S1/Description + Package set optimized for the Bitmain Antminer S3. +endef +$(eval $(call Profile,ANTMINER_S3)) diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index a2a66b8..d5a06a6 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -287,6 +287,14 @@ define Device/antminer-s1 CONSOLE := ttyATH0,115200 endef +define Device/antminer-s3 + $(Device/tplink-8mlzma) + BOARDNAME := ANTMINER-S3 + DEVICE_PROFILE := ANTMINER_S3 + TPLINK_HWID := 0x04440003 + CONSOLE := ttyATH0,115200 +endef + define Device/el-m150 $(Device/tplink-8mlzma) BOARDNAME := EL-M150 @@ -302,7 +310,7 @@ define Device/el-mini TPLINK_HWID := 0x01530001 CONSOLE := ttyATH0,115200 endef -TARGET_DEVICES += antminer-s1 el-m150 el-mini +TARGET_DEVICES += antminer-s1 antminer-s3 el-m150 el-mini define Device/gl-inet-6408A-v1 $(Device/tplink-8mlzma) diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c index 09536c6..8c543eb 100644 --- a/tools/firmware-utils/src/mktplinkfw.c +++ b/tools/firmware-utils/src/mktplinkfw.c @@ -31,6 +31,7 @@ #define HEADER_VERSION_V1 0x01000000 #define HWID_ANTMINER_S1 0x04440001 +#define HWID_ANTMINER_S3 0x04440003 #define HWID_GL_INET_V1 0x08000001 #define HWID_GS_OOLITE_V1 0x3C000101 #define HWID_TL_MR10U_V1 0x00100101