KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: Bitmain Antminer S1 & S3 cleanup

Browse source 
Sets the LEDs to boardname:color:led-name
Sets the LAN to eth0
Other corrections such as the Machine Name and HWIDs
v2 corrects the profile names in the Makefile and changes tabs to spaces
in the Makefile 'define Device/' like the other devices.

Signed-off-by: L. D. Pinney <ldpinney@gmail.com>

SVN-Revision: 47221
This commit is contained in:
John Crispin 2015-10-19 10:10:02 +00:00
parent 024083a556
commit 257e76a3df
10 changed files with 55 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
target/linux/ar71xx/base-files/etc/diag.sh
View file

@ -12,9 +12,11 @@ get_status_led() {
all0305) all0305)
status_led="eap7660d:green:ds4" status_led="eap7660d:green:ds4"
;; ;;
antminer-s1|\ antminer-s1)
status_led="antminer-s1:green:system"
;;
antminer-s3) antminer-s3)
status_led="bitmain:green:system" status_led="antminer-s3:green:system"
;; ;;
ap132) ap132)
status_led="ap132:green:status" status_led="ap132:green:status"

10
target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
View file

@ -33,14 +33,14 @@ all0315n)
;; ;;
antminer-s1) antminer-s1)
ucidef_set_led_default "sys" "SYS" "bitmain:green:sys" "0" ucidef_set_led_default "sys" "SYS" "antminer-s1:green:sys" "0"
ucidef_set_led_wlan "wlan" "WLAN" "bitmain:green:wlan" "phy0tpt" ucidef_set_led_wlan "wlan" "WLAN" "antminer-s1:green:wlan" "phy0tpt"
;; ;;
antminer-s3) antminer-s3)
ucidef_set_led_wlan "wlan" "WLAN" "bitmain:green:wlan" "phy0tpt" ucidef_set_led_wlan "wlan" "WLAN" "antminer-s3:green:wlan" "phy0tpt"
ucidef_set_led_default "sys" "SYS" "bitmain:green:sys" "0" ucidef_set_led_default "sys" "SYS" "antminer-s3:green:sys" "0"
ucidef_set_led_default "lan" "LAN" "bitmain:yellow:lan" "0" ucidef_set_led_default "lan" "LAN" "antminer-s3:yellow:lan" "0"
;; ;;
ap113) ap113)

4
target/linux/ar71xx/base-files/etc/uci-defaults/02_network
View file

@ -339,6 +339,8 @@ dlan-pro-1200-ac)
;; ;;
all0305 |\ all0305 |\
antminer-s1 |\
antminer-s3 |\
aw-nr580 |\ aw-nr580 |\
bullet-m |\ bullet-m |\
cap4200ag |\ cap4200ag |\
@ -384,8 +386,6 @@ wp543)
ucidef_set_interface_lan "eth0" ucidef_set_interface_lan "eth0"
;; ;;
antminer-s1 |\
antminer-s3 |\
dir-505-a1) dir-505-a1)
ucidef_set_interface_lan "eth1" ucidef_set_interface_lan "eth1"
;; ;;

14
target/linux/ar71xx/base-files/lib/ar71xx.sh
View file

@ -107,11 +107,11 @@ tplink_board_detect() {
"015300"*) "015300"*)
model="EasyLink EL-MINI" model="EasyLink EL-MINI"
;; ;;
"04440001"*) "044401"*)
model="BITMAIN ANTMINER S1" model="ANTMINER-S1"
;; ;;
"04440003"*) "044403"*)
model="BITMAIN ANTMINER S3" model="ANTMINER-S3"
;; ;;
"120000"*) "120000"*)
model="MERCURY MAC1200R" model="MERCURY MAC1200R"
@ -350,6 +350,12 @@ ar71xx_board_detect() {
*ALL0315N) *ALL0315N)
name="all0315n" name="all0315n"
;; ;;
*Antminer-S1)
name="antminer-s1"
;;
*Antminer-S3)
name="antminer-s3"
;;
*AP113) *AP113)
name="ap113" name="ap113"
;; ;;

6
target/linux/ar71xx/files/arch/mips/ath79/mach-antminer-s1.c
View file

@ -42,11 +42,11 @@ static struct flash_platform_data ANTMINER_S1_flash_data = {
static struct gpio_led ANTMINER_S1_leds_gpio[] __initdata = { static struct gpio_led ANTMINER_S1_leds_gpio[] __initdata = {
{ {
.name = "bitmain:green:system", .name = "antminer-s1:green:system",
.gpio = ANTMINER_S1_GPIO_LED_SYSTEM, .gpio = ANTMINER_S1_GPIO_LED_SYSTEM,
.active_low = 0, .active_low = 0,
},{ },{
.name = "bitmain:green:wlan", .name = "antminer-s1:green:wlan",
.gpio = ANTMINER_S1_GPIO_LED_WLAN, .gpio = ANTMINER_S1_GPIO_LED_WLAN,
.active_low = 0, .active_low = 0,
}, },
@ -95,4 +95,4 @@ static void __init antminer_s1_setup(void)
} }
MIPS_MACHINE(ATH79_MACH_ANTMINER_S1, "ANTMINER-S1", MIPS_MACHINE(ATH79_MACH_ANTMINER_S1, "ANTMINER-S1",
"Bitmain Antminer S1", antminer_s1_setup); "Antminer-S1", antminer_s1_setup);

8
target/linux/ar71xx/files/arch/mips/ath79/mach-antminer-s3.c
View file

@ -42,15 +42,15 @@ static struct flash_platform_data ANTMINER_S3_flash_data = {
static struct gpio_led ANTMINER_S3_leds_gpio[] __initdata = { static struct gpio_led ANTMINER_S3_leds_gpio[] __initdata = {
{ {
.name = "bitmain:green:wlan", .name = "antminer-s3:green:wlan",
.gpio = ANTMINER_S3_GPIO_LED_WLAN, .gpio = ANTMINER_S3_GPIO_LED_WLAN,
.active_low = 0, .active_low = 0,
},{ },{
.name = "bitmain:green:system", .name = "antminer-s3:green:system",
.gpio = ANTMINER_S3_GPIO_LED_SYSTEM, .gpio = ANTMINER_S3_GPIO_LED_SYSTEM,
.active_low = 0, .active_low = 0,
},{ },{
.name = "bitmain:yellow:lan", .name = "antminer-s3:yellow:lan",
.gpio = ANTMINER_S3_GPIO_LED_LAN, .gpio = ANTMINER_S3_GPIO_LED_LAN,
.active_low = 0, .active_low = 0,
}, },
@ -95,4 +95,4 @@ static void __init antminer_s3_setup(void)
} }
MIPS_MACHINE(ATH79_MACH_ANTMINER_S3, "ANTMINER-S3", MIPS_MACHINE(ATH79_MACH_ANTMINER_S3, "ANTMINER-S3",
"Bitmain Antminer S3", antminer_s3_setup); "Antminer-S3", antminer_s3_setup);

16
target/linux/ar71xx/generic/profiles/antminer.mk
View file

@ -5,24 +5,24 @@
# See /LICENSE for more information. # See /LICENSE for more information.
# #
define Profile/ANTMINER_S1 define Profile/ANTMINERS1
NAME:=Antminer S1 NAME:=Antminer-S1
PACKAGES:=kmod-usb-core kmod-usb2 kmod-crypto-manager kmod-i2c-gpio-custom kmod-usb-hid PACKAGES:=kmod-usb-core kmod-usb2 kmod-crypto-manager kmod-i2c-gpio-custom kmod-usb-hid
endef endef
define Profile/ANTMINER_S1/Description define Profile/ANTMINERS1/Description
Package set optimized for the Bitmain Antminer S1. Package set optimized for the Bitmain Antminer S1.
endef endef
$(eval $(call Profile,ANTMINER_S1)) $(eval $(call Profile,ANTMINERS1))
define Profile/ANTMINER_S3 define Profile/ANTMINERS3
NAME:=Antminer S3 NAME:=Antminer-S3
PACKAGES:=kmod-usb-core kmod-usb2 kmod-crypto-manager kmod-i2c-gpio-custom kmod-usb-hid PACKAGES:=kmod-usb-core kmod-usb2 kmod-crypto-manager kmod-i2c-gpio-custom kmod-usb-hid
endef endef
define Profile/ANTMINER_S1/Description define Profile/ANTMINERS3/Description
Package set optimized for the Bitmain Antminer S3. Package set optimized for the Bitmain Antminer S3.
endef endef
$(eval $(call Profile,ANTMINER_S3)) $(eval $(call Profile,ANTMINERS3))

20
target/linux/ar71xx/image/Makefile
View file

@ -372,19 +372,19 @@ endef
TARGET_DEVICES += archer-c5-v1 archer-c7-v1 archer-c7-v2 TARGET_DEVICES += archer-c5-v1 archer-c7-v1 archer-c7-v2
define Device/antminer-s1 define Device/antminer-s1
$(Device/tplink-8mlzma) $(Device/tplink-8mlzma)
BOARDNAME := ANTMINER-S1 BOARDNAME := ANTMINER-S1
DEVICE_PROFILE := ANTMINER_S1 DEVICE_PROFILE := ANTMINERS1
TPLINK_HWID := 0x04440001 TPLINK_HWID := 0x04440101
CONSOLE := ttyATH0,115200 CONSOLE := ttyATH0,115200
endef endef
define Device/antminer-s3 define Device/antminer-s3
$(Device/tplink-8mlzma) $(Device/tplink-8mlzma)
BOARDNAME := ANTMINER-S3 BOARDNAME := ANTMINER-S3
DEVICE_PROFILE := ANTMINER_S3 DEVICE_PROFILE := ANTMINERS3
TPLINK_HWID := 0x04440003 TPLINK_HWID := 0x04440301
CONSOLE := ttyATH0,115200 CONSOLE := ttyATH0,115200
endef endef
define Device/el-m150 define Device/el-m150

4
target/linux/ar71xx/patches-4.1/700-MIPS-ath79-openwrt-machines.patch
View file

@ -9,8 +9,8 @@
+ ATH79_MACH_ALL0258N, /* Allnet ALL0258N */ + ATH79_MACH_ALL0258N, /* Allnet ALL0258N */
+ ATH79_MACH_ALL0305, /* Allnet ALL0305 */ + ATH79_MACH_ALL0305, /* Allnet ALL0305 */
+ ATH79_MACH_ALL0315N, /* Allnet ALL0315N */ + ATH79_MACH_ALL0315N, /* Allnet ALL0315N */
+ ATH79_MACH_ANTMINER_S1, /* Bitmain Antminer S1 */ + ATH79_MACH_ANTMINER_S1, /* Antminer S1 */
+ ATH79_MACH_ANTMINER_S3, /* Bitmain Antminer S3 */ + ATH79_MACH_ANTMINER_S3, /* Antminer S3 */
+ ATH79_MACH_AP113, /* Atheros AP113 reference board */ + ATH79_MACH_AP113, /* Atheros AP113 reference board */
ATH79_MACH_AP121, /* Atheros AP121 reference board */ ATH79_MACH_AP121, /* Atheros AP121 reference board */
ATH79_MACH_AP121_MINI, /* Atheros AP121-MINI reference board */ ATH79_MACH_AP121_MINI, /* Atheros AP121-MINI reference board */

9
tools/firmware-utils/src/mktplinkfw.c
View file

@ -31,8 +31,8 @@
#define HEADER_VERSION_V1 0x01000000 #define HEADER_VERSION_V1 0x01000000
#define HEADER_VERSION_V2 0x02000000 #define HEADER_VERSION_V2 0x02000000
#define HWID_ANTMINER_S1 0x04440001 #define HWID_ANTMINER_S1 0x04440101
#define HWID_ANTMINER_S3 0x04440003 #define HWID_ANTMINER_S3 0x04440301
#define HWID_GL_INET_V1 0x08000001 #define HWID_GL_INET_V1 0x08000001
#define HWID_GS_OOLITE_V1 0x3C000101 #define HWID_GS_OOLITE_V1 0x3C000101
#define HWID_ONION_OMEGA 0x04700001 #define HWID_ONION_OMEGA 0x04700001
@ -433,6 +433,11 @@ static struct board_info boards[] = {
.hw_id = HWID_ANTMINER_S1, .hw_id = HWID_ANTMINER_S1,
.hw_rev = 1, .hw_rev = 1,
.layout_id = "8Mlzma", .layout_id = "8Mlzma",
}, {
.id = "ANTMINER-S3",
.hw_id = HWID_ANTMINER_S3,
.hw_rev = 1,
.layout_id = "8Mlzma",
}, { }, {
/* terminating entry */ /* terminating entry */
} }