Author: blogic Date: 2015-10-19 12:10:02 +0200 (Mon, 19 Oct 2015) New Revision: 47221
Modified: trunk/target/linux/ar71xx/base-files/etc/diag.sh trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds trunk/target/linux/ar71xx/base-files/etc/uci-defaults/02_network trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-antminer-s1.c trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-antminer-s3.c trunk/target/linux/ar71xx/generic/profiles/antminer.mk trunk/target/linux/ar71xx/image/Makefile trunk/target/linux/ar71xx/patches-4.1/700-MIPS-ath79-openwrt-machines.patch trunk/tools/firmware-utils/src/mktplinkfw.c Log: ar71xx: Bitmain Antminer S1 & S3 cleanup 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 <[email protected]> Modified: trunk/target/linux/ar71xx/base-files/etc/diag.sh =================================================================== --- trunk/target/linux/ar71xx/base-files/etc/diag.sh 2015-10-19 10:09:54 UTC (rev 47220) +++ trunk/target/linux/ar71xx/base-files/etc/diag.sh 2015-10-19 10:10:02 UTC (rev 47221) @@ -12,9 +12,11 @@ all0305) status_led="eap7660d:green:ds4" ;; - antminer-s1|\ + antminer-s1) + status_led="antminer-s1:green:system" + ;; antminer-s3) - status_led="bitmain:green:system" + status_led="antminer-s3:green:system" ;; ap132) status_led="ap132:green:status" Modified: trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds =================================================================== --- trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds 2015-10-19 10:09:54 UTC (rev 47220) +++ trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds 2015-10-19 10:10:02 UTC (rev 47221) @@ -33,14 +33,14 @@ ;; antminer-s1) - ucidef_set_led_default "sys" "SYS" "bitmain:green:sys" "0" - ucidef_set_led_wlan "wlan" "WLAN" "bitmain:green:wlan" "phy0tpt" + ucidef_set_led_default "sys" "SYS" "antminer-s1:green:sys" "0" + ucidef_set_led_wlan "wlan" "WLAN" "antminer-s1: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" + ucidef_set_led_wlan "wlan" "WLAN" "antminer-s3:green:wlan" "phy0tpt" + ucidef_set_led_default "sys" "SYS" "antminer-s3:green:sys" "0" + ucidef_set_led_default "lan" "LAN" "antminer-s3:yellow:lan" "0" ;; ap113) Modified: trunk/target/linux/ar71xx/base-files/etc/uci-defaults/02_network =================================================================== --- trunk/target/linux/ar71xx/base-files/etc/uci-defaults/02_network 2015-10-19 10:09:54 UTC (rev 47220) +++ trunk/target/linux/ar71xx/base-files/etc/uci-defaults/02_network 2015-10-19 10:10:02 UTC (rev 47221) @@ -339,6 +339,8 @@ ;; all0305 |\ +antminer-s1 |\ +antminer-s3 |\ aw-nr580 |\ bullet-m |\ cap4200ag |\ @@ -384,8 +386,6 @@ ucidef_set_interface_lan "eth0" ;; -antminer-s1 |\ -antminer-s3 |\ dir-505-a1) ucidef_set_interface_lan "eth1" ;; Modified: trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh =================================================================== --- trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh 2015-10-19 10:09:54 UTC (rev 47220) +++ trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh 2015-10-19 10:10:02 UTC (rev 47221) @@ -107,11 +107,11 @@ "015300"*) model="EasyLink EL-MINI" ;; - "04440001"*) - model="BITMAIN ANTMINER S1" + "044401"*) + model="ANTMINER-S1" ;; - "04440003"*) - model="BITMAIN ANTMINER S3" + "044403"*) + model="ANTMINER-S3" ;; "120000"*) model="MERCURY MAC1200R" @@ -350,6 +350,12 @@ *ALL0315N) name="all0315n" ;; + *Antminer-S1) + name="antminer-s1" + ;; + *Antminer-S3) + name="antminer-s3" + ;; *AP113) name="ap113" ;; Modified: trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-antminer-s1.c =================================================================== --- trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-antminer-s1.c 2015-10-19 10:09:54 UTC (rev 47220) +++ trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-antminer-s1.c 2015-10-19 10:10:02 UTC (rev 47221) @@ -42,11 +42,11 @@ static struct gpio_led ANTMINER_S1_leds_gpio[] __initdata = { { - .name = "bitmain:green:system", + .name = "antminer-s1:green:system", .gpio = ANTMINER_S1_GPIO_LED_SYSTEM, .active_low = 0, },{ - .name = "bitmain:green:wlan", + .name = "antminer-s1:green:wlan", .gpio = ANTMINER_S1_GPIO_LED_WLAN, .active_low = 0, }, @@ -95,4 +95,4 @@ } MIPS_MACHINE(ATH79_MACH_ANTMINER_S1, "ANTMINER-S1", - "Bitmain Antminer S1", antminer_s1_setup); + "Antminer-S1", antminer_s1_setup); Modified: trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-antminer-s3.c =================================================================== --- trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-antminer-s3.c 2015-10-19 10:09:54 UTC (rev 47220) +++ trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-antminer-s3.c 2015-10-19 10:10:02 UTC (rev 47221) @@ -42,15 +42,15 @@ static struct gpio_led ANTMINER_S3_leds_gpio[] __initdata = { { - .name = "bitmain:green:wlan", + .name = "antminer-s3:green:wlan", .gpio = ANTMINER_S3_GPIO_LED_WLAN, .active_low = 0, },{ - .name = "bitmain:green:system", + .name = "antminer-s3:green:system", .gpio = ANTMINER_S3_GPIO_LED_SYSTEM, .active_low = 0, },{ - .name = "bitmain:yellow:lan", + .name = "antminer-s3:yellow:lan", .gpio = ANTMINER_S3_GPIO_LED_LAN, .active_low = 0, }, @@ -95,4 +95,4 @@ } MIPS_MACHINE(ATH79_MACH_ANTMINER_S3, "ANTMINER-S3", - "Bitmain Antminer S3", antminer_s3_setup); + "Antminer-S3", antminer_s3_setup); Modified: trunk/target/linux/ar71xx/generic/profiles/antminer.mk =================================================================== --- trunk/target/linux/ar71xx/generic/profiles/antminer.mk 2015-10-19 10:09:54 UTC (rev 47220) +++ trunk/target/linux/ar71xx/generic/profiles/antminer.mk 2015-10-19 10:10:02 UTC (rev 47221) @@ -5,24 +5,24 @@ # See /LICENSE for more information. # -define Profile/ANTMINER_S1 - NAME:=Antminer S1 +define Profile/ANTMINERS1 + NAME:=Antminer-S1 PACKAGES:=kmod-usb-core kmod-usb2 kmod-crypto-manager kmod-i2c-gpio-custom kmod-usb-hid endef -define Profile/ANTMINER_S1/Description +define Profile/ANTMINERS1/Description Package set optimized for the Bitmain Antminer S1. endef -$(eval $(call Profile,ANTMINER_S1)) +$(eval $(call Profile,ANTMINERS1)) -define Profile/ANTMINER_S3 - NAME:=Antminer S3 +define Profile/ANTMINERS3 + 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 +define Profile/ANTMINERS3/Description Package set optimized for the Bitmain Antminer S3. endef -$(eval $(call Profile,ANTMINER_S3)) +$(eval $(call Profile,ANTMINERS3)) Modified: trunk/target/linux/ar71xx/image/Makefile =================================================================== --- trunk/target/linux/ar71xx/image/Makefile 2015-10-19 10:09:54 UTC (rev 47220) +++ trunk/target/linux/ar71xx/image/Makefile 2015-10-19 10:10:02 UTC (rev 47221) @@ -372,19 +372,19 @@ TARGET_DEVICES += archer-c5-v1 archer-c7-v1 archer-c7-v2 define Device/antminer-s1 - $(Device/tplink-8mlzma) - BOARDNAME := ANTMINER-S1 - DEVICE_PROFILE := ANTMINER_S1 - TPLINK_HWID := 0x04440001 - CONSOLE := ttyATH0,115200 + $(Device/tplink-8mlzma) + BOARDNAME := ANTMINER-S1 + DEVICE_PROFILE := ANTMINERS1 + TPLINK_HWID := 0x04440101 + CONSOLE := ttyATH0,115200 endef define Device/antminer-s3 - $(Device/tplink-8mlzma) - BOARDNAME := ANTMINER-S3 - DEVICE_PROFILE := ANTMINER_S3 - TPLINK_HWID := 0x04440003 - CONSOLE := ttyATH0,115200 + $(Device/tplink-8mlzma) + BOARDNAME := ANTMINER-S3 + DEVICE_PROFILE := ANTMINERS3 + TPLINK_HWID := 0x04440301 + CONSOLE := ttyATH0,115200 endef define Device/el-m150 Modified: trunk/target/linux/ar71xx/patches-4.1/700-MIPS-ath79-openwrt-machines.patch =================================================================== --- trunk/target/linux/ar71xx/patches-4.1/700-MIPS-ath79-openwrt-machines.patch 2015-10-19 10:09:54 UTC (rev 47220) +++ trunk/target/linux/ar71xx/patches-4.1/700-MIPS-ath79-openwrt-machines.patch 2015-10-19 10:10:02 UTC (rev 47221) @@ -9,8 +9,8 @@ + ATH79_MACH_ALL0258N, /* Allnet ALL0258N */ + ATH79_MACH_ALL0305, /* Allnet ALL0305 */ + ATH79_MACH_ALL0315N, /* Allnet ALL0315N */ -+ ATH79_MACH_ANTMINER_S1, /* Bitmain Antminer S1 */ -+ ATH79_MACH_ANTMINER_S3, /* Bitmain Antminer S3 */ ++ ATH79_MACH_ANTMINER_S1, /* Antminer S1 */ ++ ATH79_MACH_ANTMINER_S3, /* Antminer S3 */ + ATH79_MACH_AP113, /* Atheros AP113 reference board */ ATH79_MACH_AP121, /* Atheros AP121 reference board */ ATH79_MACH_AP121_MINI, /* Atheros AP121-MINI reference board */ Modified: trunk/tools/firmware-utils/src/mktplinkfw.c =================================================================== --- trunk/tools/firmware-utils/src/mktplinkfw.c 2015-10-19 10:09:54 UTC (rev 47220) +++ trunk/tools/firmware-utils/src/mktplinkfw.c 2015-10-19 10:10:02 UTC (rev 47221) @@ -31,8 +31,8 @@ #define HEADER_VERSION_V1 0x01000000 #define HEADER_VERSION_V2 0x02000000 -#define HWID_ANTMINER_S1 0x04440001 -#define HWID_ANTMINER_S3 0x04440003 +#define HWID_ANTMINER_S1 0x04440101 +#define HWID_ANTMINER_S3 0x04440301 #define HWID_GL_INET_V1 0x08000001 #define HWID_GS_OOLITE_V1 0x3C000101 #define HWID_ONION_OMEGA 0x04700001 @@ -434,6 +434,11 @@ .hw_rev = 1, .layout_id = "8Mlzma", }, { + .id = "ANTMINER-S3", + .hw_id = HWID_ANTMINER_S3, + .hw_rev = 1, + .layout_id = "8Mlzma", + }, { /* terminating entry */ } }; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
