| Message ID | 32F54808-6FD3-4C97-B642-AD8817EBDCA1@ndoo.sg |
|---|---|
| State | Changes Requested |
| Delegated to: | John Crispin |
| Headers | show |
Hello Andrew, Just two comments. Your patch changelog should go below "---" after the Signed-off-by line, so that it won't get included in commit message. It's common to include just a small description about the hardware the patch adds support for, examples: [1], [2], [3]. Cheers, Piotr [1] https://dev.openwrt.org/changeset/44238 [2] https://dev.openwrt.org/changeset/41939 [3] https://dev.openwrt.org/changeset/46454 2016-04-29 14:03 GMT+02:00 Andrew Yong <me@ndoo.sg>: > PATCHv1: > This patch adds support for the SamKnows version 8.0 Whitebox, built > around the MT7621 platform. 2.4GHz appears to be working, albeit > poorly; 5GHz not working yet. > > PATCHv2: > - Fixed LED name in DTS. > > PATCHv3: > DTS: Syntax error fixed, LEDs and buttons mapped correctly now > - diag.sh updated to blink WPS LED on boot > - 2.4GHz wifi is working but txpower is stuck at 0, DTS ROM offset > matches SamKnows firmware > - 5GHz wifi not working, DTS pcie1,0 matches SamKnows firmware > > PATCHv4: > - I didn't commit some fixes in PATCHv3, that's fixed now > > PATCHv5: > - Added preinit hook to reset SamKnows Whitebox 8 u-boot boot counter > to prevent soft brick by booting into nonexistent backup partition > - Broke 2.4GHz WiFi but 5GHz sorta works (swapped pcie0/1 in DTS, > needs further investigation, effective txpower is still 0) > - Experimenting on wifi but that'll be a future patch, board boots fine now. > > PATCHv6: > - Used init script to reset bootcount, preinit is too early to use fw-setenv > > PATCHv7: > - Added model to sysupgrade. Tested thoroughly in general and I'm happy with this. Sorry for the many revisions. > > PATCHv8: > - Added SamKnows recovery partition to partition table, in case someone specifically wants to send their bootloader to it > - Fixed Wi-Fi by patching MT7602EN device ID (shows up as 7612) into mt76 kernel module (verified that signal strength on both bands is good, tested AP and STA modes > > PATCHv9: > - Fixed LAN MAC address EEPROM offset > - Fixed mt76 patch whitespace issues > - Renamed mt76 patch to mt7602en to accurately reflect the physical chip it's supporting > > PATCHv10: > - Removed mt76 patch in favor of upstream patch > - I solemnly swear not to have to revision my patch >5 times every again > > Initial support for SamKnows Whitebox 8 > > Signed-off-by: Andrew Yong <me@ndoo.sg> > > diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips > index a759bcc..9ad5974 100644 > --- a/package/boot/uboot-envtools/files/ramips > +++ b/package/boot/uboot-envtools/files/ramips > @@ -24,7 +24,8 @@ linkits7688d | \ > wsr-600 | \ > wsr-1166 | \ > br6425 | \ > -miwifi-nano) > +miwifi-nano | \ > +sk-wb8) > ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x1000" "0x10000" > ;; > esac > diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds > index 47e1e6a..28db48f 100755 > --- a/target/linux/ramips/base-files/etc/board.d/01_leds > +++ b/target/linux/ramips/base-files/etc/board.d/01_leds > @@ -247,6 +247,9 @@ rt-n14u) > set_wifi_led "$board:blue:air" > set_usb_led "$board:blue:usb" > ;; > +sk-wb8) > + set_usb_led "$board:green:usb" > + ;; > tiny-ac) > set_wifi_led "$board:orange:wifi" > set_usb_led "$board:green:usb" > diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network > index ee690f6..3cbf577 100755 > --- a/target/linux/ramips/base-files/etc/board.d/02_network > +++ b/target/linux/ramips/base-files/etc/board.d/02_network > @@ -77,6 +77,7 @@ ramips_setup_interfaces() > pbr-m1|\ > psg1208|\ > sap-g3200u3|\ > + sk-wb8|\ > wf-2881|\ > whr-300hp2|\ > whr-600d|\ > @@ -314,6 +315,9 @@ ramips_setup_macs() > lan_mac=$(macaddr_setbit_la "$lan_mac") > wan_mac=$(mtd_get_mac_binary factory 32772) > ;; > + sk-wb8) > + wan_mac=$(mtd_get_mac_binary factory 57350) > + ;; > tew-691gr) > lan_mac=$(cat /sys/class/net/eth0/address) > wan_mac=$(macaddr_add "$lan_mac" 3) > diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh > index c638d16..e432fa6 100644 > --- a/target/linux/ramips/base-files/etc/diag.sh > +++ b/target/linux/ramips/base-files/etc/diag.sh > @@ -79,6 +79,7 @@ get_status_led() { > ;; > awapn2403|\ > dir-645|\ > + sk-wb8|\ > wrh-300cr) > status_led="$board:green:wps" > ;; > diff --git a/target/linux/ramips/base-files/etc/init.d/bootcount b/target/linux/ramips/base-files/etc/init.d/bootcount > new file mode 100755 > index 0000000..b93e3c9 > --- /dev/null > +++ b/target/linux/ramips/base-files/etc/init.d/bootcount > @@ -0,0 +1,11 @@ > +#!/bin/sh /etc/rc.common > +. /lib/ramips.sh > + > +START=99 > + > +start() { > + local board=$(ramips_board_name) > + if [ $board = "sk-wb8" ]; then > + fw_setenv bootcount 0 > + fi > +} > diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh > index 0ac0f68..9d5421b 100755 > --- a/target/linux/ramips/base-files/lib/ramips.sh > +++ b/target/linux/ramips/base-files/lib/ramips.sh > @@ -376,6 +376,9 @@ ramips_board_detect() { > *"RUT5XX") > name="rut5xx" > ;; > + *"SamKnows Whitebox 8") > + name="sk-wb8" > + ;; > *"SAP-G3200U3") > name="sap-g3200u3" > ;; > diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh > index 86ea4a3..6036f73 100755 > --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh > +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh > @@ -112,6 +112,7 @@ platform_check_image() { > rt-n56u|\ > rut5xx|\ > sap-g3200u3|\ > + sk-wb8|\ > sl-r7205|\ > tew-691gr|\ > tew-692gr|\ > diff --git a/target/linux/ramips/dts/SK-WB8.dts b/target/linux/ramips/dts/SK-WB8.dts > new file mode 100644 > index 0000000..350cb4a > --- /dev/null > +++ b/target/linux/ramips/dts/SK-WB8.dts > @@ -0,0 +1,127 @@ > +/dts-v1/; > + > +#include "mt7621.dtsi" > + > +/ { > + compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc"; > + model = "SamKnows Whitebox 8"; > + > + memory@0 { > + device_type = "memory"; > + reg = <0x0 0x8000000>; > + }; > + > + chosen { > + bootargs = "console=ttyS0,57600"; > + }; > + > + palmbus@1E000000 { > + spi@b00 { > + status = "okay"; > + > + m25p80@0 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "mx25l6405d"; > + reg = <0 0>; > + linux,modalias = "m25p80"; > + spi-max-frequency = <10000000>; > + > + partition@0 { > + label = "u-boot"; > + reg = <0x0 0x30000>; > + read-only; > + }; > + > + partition@30000 { > + label = "u-boot-env"; > + reg = <0x30000 0x10000>; > + }; > + > + factory: partition@40000 { > + label = "factory"; > + reg = <0x40000 0x10000>; > + read-only; > + }; > + > + partition@50000 { > + label = "firmware"; > + reg = <0x50000 0x7b0000>; > + }; > + > + partition@e30000 { > + label = "recovery"; > + reg = <0xe30000 0x1d0000>; > + }; > + > + }; > + }; > + }; > + > + pcie@1e140000 { > + status = "okay"; > + > + pcie0 { > + mt76@0,0 { > + reg = <0x0000 0 0 0 0>; > + device_type = "pci"; > + mediatek,mtd-eeprom = <&factory 0x8000>; > + mediatek,2ghz = <0>; > + }; > + }; > + > + pcie1 { > + mt76@1,0 { > + reg = <0x0000 0 0 0 0>; > + device_type = "pci"; > + mediatek,mtd-eeprom = <&factory 0x0000>; > + mediatek,5ghz = <0>; > + }; > + }; > + }; > + > + ethernet@1e100000 { > + mtd-mac-address = <&factory 0xe000>; > + }; > + > + gpio-leds { > + compatible = "gpio-leds"; > + > + wps { > + label = "sk-wb8:green:wps"; > + gpios = <&gpio1 14 1>; > + }; > + > + usb { > + label = "sk-wb8:green:usb"; > + gpios = <&gpio1 15 1>; > + }; > + }; > + > + gpio-keys-polled { > + compatible = "gpio-keys-polled"; > + #address-cells = <1>; > + #size-cells = <0>; > + poll-interval = <20>; > + wps { > + label = "wps"; > + gpios = <&gpio1 11 1>; > + linux,code = <0x211>; > + }; > + reset { > + label = "reset"; > + gpios = <&gpio1 9 1>; > + linux,code = <0x198>; > + }; > + }; > + > + pinctrl { > + state_default: pinctrl0 { > + gpio { > + ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; > + ralink,function = "gpio"; > + }; > + }; > + }; > + > +}; > diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk > index 1b8d3da..a09f4ab 100644 > --- a/target/linux/ramips/image/mt7621.mk > +++ b/target/linux/ramips/image/mt7621.mk > @@ -138,6 +138,12 @@ define Device/ubnt-erx > endef > TARGET_DEVICES += ubnt-erx > > +define Device/sk-wb8 > + DTS := SK-WB8 > + IMAGE_SIZE := $(ralink_default_fw_size_16M) > +endef > +TARGET_DEVICES += sk-wb8 > + > # FIXME: is this still needed? > define Image/Prepare > #define Build/Compile > diff --git a/target/linux/ramips/mt7621/profiles/sk-wb8.mk b/target/linux/ramips/mt7621/profiles/sk-wb8.mk > new file mode 100644 > index 0000000..aa2e45e > --- /dev/null > +++ b/target/linux/ramips/mt7621/profiles/sk-wb8.mk > @@ -0,0 +1,18 @@ > +# > +# Copyright (C) 2016 OpenWrt.org > +# > +# This is free software, licensed under the GNU General Public License v2. > +# See /LICENSE for more information. > +# > + > +define Profile/SK-WB8 > + NAME:=SamKnows Whitebox 8 > + PACKAGES:=\ > + kmod-usb-core kmod-usb3 \ > + kmod-ledtrig-usbdev uboot-envtools > +endef > + > +define Profile/SK-WB8/Description > + Package set compatible with the SamKnows Whitebox 8. > +endef > +$(eval $(call Profile,SK-WB8)) > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Noted. Would I need to re-send the same v10? On 29 Apr 2016 20:30, "Piotr Dymacz" <pepe2k@gmail.com> wrote: > Hello Andrew, > > Just two comments. > > Your patch changelog should go below "---" after the Signed-off-by > line, so that it won't get included in commit message. > It's common to include just a small description about the hardware the > patch adds support for, examples: [1], [2], [3]. > > Cheers, > Piotr > > [1] https://dev.openwrt.org/changeset/44238 > [2] https://dev.openwrt.org/changeset/41939 > [3] https://dev.openwrt.org/changeset/46454 > > > 2016-04-29 14:03 GMT+02:00 Andrew Yong <me@ndoo.sg>: > > PATCHv1: > > This patch adds support for the SamKnows version 8.0 Whitebox, built > > around the MT7621 platform. 2.4GHz appears to be working, albeit > > poorly; 5GHz not working yet. > > > > PATCHv2: > > - Fixed LED name in DTS. > > > > PATCHv3: > > DTS: Syntax error fixed, LEDs and buttons mapped correctly now > > - diag.sh updated to blink WPS LED on boot > > - 2.4GHz wifi is working but txpower is stuck at 0, DTS ROM offset > > matches SamKnows firmware > > - 5GHz wifi not working, DTS pcie1,0 matches SamKnows firmware > > > > PATCHv4: > > - I didn't commit some fixes in PATCHv3, that's fixed now > > > > PATCHv5: > > - Added preinit hook to reset SamKnows Whitebox 8 u-boot boot counter > > to prevent soft brick by booting into nonexistent backup partition > > - Broke 2.4GHz WiFi but 5GHz sorta works (swapped pcie0/1 in DTS, > > needs further investigation, effective txpower is still 0) > > - Experimenting on wifi but that'll be a future patch, board boots fine > now. > > > > PATCHv6: > > - Used init script to reset bootcount, preinit is too early to use > fw-setenv > > > > PATCHv7: > > - Added model to sysupgrade. Tested thoroughly in general and I'm happy > with this. Sorry for the many revisions. > > > > PATCHv8: > > - Added SamKnows recovery partition to partition table, in case someone > specifically wants to send their bootloader to it > > - Fixed Wi-Fi by patching MT7602EN device ID (shows up as 7612) into > mt76 kernel module (verified that signal strength on both bands is good, > tested AP and STA modes > > > > PATCHv9: > > - Fixed LAN MAC address EEPROM offset > > - Fixed mt76 patch whitespace issues > > - Renamed mt76 patch to mt7602en to accurately reflect the physical chip > it's supporting > > > > PATCHv10: > > - Removed mt76 patch in favor of upstream patch > > - I solemnly swear not to have to revision my patch >5 times every again > > > > Initial support for SamKnows Whitebox 8 > > > > Signed-off-by: Andrew Yong <me@ndoo.sg> > > > > diff --git a/package/boot/uboot-envtools/files/ramips > b/package/boot/uboot-envtools/files/ramips > > index a759bcc..9ad5974 100644 > > --- a/package/boot/uboot-envtools/files/ramips > > +++ b/package/boot/uboot-envtools/files/ramips > > @@ -24,7 +24,8 @@ linkits7688d | \ > > wsr-600 | \ > > wsr-1166 | \ > > br6425 | \ > > -miwifi-nano) > > +miwifi-nano | \ > > +sk-wb8) > > ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x1000" "0x10000" > > ;; > > esac > > diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds > b/target/linux/ramips/base-files/etc/board.d/01_leds > > index 47e1e6a..28db48f 100755 > > --- a/target/linux/ramips/base-files/etc/board.d/01_leds > > +++ b/target/linux/ramips/base-files/etc/board.d/01_leds > > @@ -247,6 +247,9 @@ rt-n14u) > > set_wifi_led "$board:blue:air" > > set_usb_led "$board:blue:usb" > > ;; > > +sk-wb8) > > + set_usb_led "$board:green:usb" > > + ;; > > tiny-ac) > > set_wifi_led "$board:orange:wifi" > > set_usb_led "$board:green:usb" > > diff --git a/target/linux/ramips/base-files/etc/board.d/02_network > b/target/linux/ramips/base-files/etc/board.d/02_network > > index ee690f6..3cbf577 100755 > > --- a/target/linux/ramips/base-files/etc/board.d/02_network > > +++ b/target/linux/ramips/base-files/etc/board.d/02_network > > @@ -77,6 +77,7 @@ ramips_setup_interfaces() > > pbr-m1|\ > > psg1208|\ > > sap-g3200u3|\ > > + sk-wb8|\ > > wf-2881|\ > > whr-300hp2|\ > > whr-600d|\ > > @@ -314,6 +315,9 @@ ramips_setup_macs() > > lan_mac=$(macaddr_setbit_la "$lan_mac") > > wan_mac=$(mtd_get_mac_binary factory 32772) > > ;; > > + sk-wb8) > > + wan_mac=$(mtd_get_mac_binary factory 57350) > > + ;; > > tew-691gr) > > lan_mac=$(cat /sys/class/net/eth0/address) > > wan_mac=$(macaddr_add "$lan_mac" 3) > > diff --git a/target/linux/ramips/base-files/etc/diag.sh > b/target/linux/ramips/base-files/etc/diag.sh > > index c638d16..e432fa6 100644 > > --- a/target/linux/ramips/base-files/etc/diag.sh > > +++ b/target/linux/ramips/base-files/etc/diag.sh > > @@ -79,6 +79,7 @@ get_status_led() { > > ;; > > awapn2403|\ > > dir-645|\ > > + sk-wb8|\ > > wrh-300cr) > > status_led="$board:green:wps" > > ;; > > diff --git a/target/linux/ramips/base-files/etc/init.d/bootcount > b/target/linux/ramips/base-files/etc/init.d/bootcount > > new file mode 100755 > > index 0000000..b93e3c9 > > --- /dev/null > > +++ b/target/linux/ramips/base-files/etc/init.d/bootcount > > @@ -0,0 +1,11 @@ > > +#!/bin/sh /etc/rc.common > > +. /lib/ramips.sh > > + > > +START=99 > > + > > +start() { > > + local board=$(ramips_board_name) > > + if [ $board = "sk-wb8" ]; then > > + fw_setenv bootcount 0 > > + fi > > +} > > diff --git a/target/linux/ramips/base-files/lib/ramips.sh > b/target/linux/ramips/base-files/lib/ramips.sh > > index 0ac0f68..9d5421b 100755 > > --- a/target/linux/ramips/base-files/lib/ramips.sh > > +++ b/target/linux/ramips/base-files/lib/ramips.sh > > @@ -376,6 +376,9 @@ ramips_board_detect() { > > *"RUT5XX") > > name="rut5xx" > > ;; > > + *"SamKnows Whitebox 8") > > + name="sk-wb8" > > + ;; > > *"SAP-G3200U3") > > name="sap-g3200u3" > > ;; > > diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh > b/target/linux/ramips/base-files/lib/upgrade/platform.sh > > index 86ea4a3..6036f73 100755 > > --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh > > +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh > > @@ -112,6 +112,7 @@ platform_check_image() { > > rt-n56u|\ > > rut5xx|\ > > sap-g3200u3|\ > > + sk-wb8|\ > > sl-r7205|\ > > tew-691gr|\ > > tew-692gr|\ > > diff --git a/target/linux/ramips/dts/SK-WB8.dts > b/target/linux/ramips/dts/SK-WB8.dts > > new file mode 100644 > > index 0000000..350cb4a > > --- /dev/null > > +++ b/target/linux/ramips/dts/SK-WB8.dts > > @@ -0,0 +1,127 @@ > > +/dts-v1/; > > + > > +#include "mt7621.dtsi" > > + > > +/ { > > + compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc"; > > + model = "SamKnows Whitebox 8"; > > + > > + memory@0 { > > + device_type = "memory"; > > + reg = <0x0 0x8000000>; > > + }; > > + > > + chosen { > > + bootargs = "console=ttyS0,57600"; > > + }; > > + > > + palmbus@1E000000 { > > + spi@b00 { > > + status = "okay"; > > + > > + m25p80@0 { > > + #address-cells = <1>; > > + #size-cells = <1>; > > + compatible = "mx25l6405d"; > > + reg = <0 0>; > > + linux,modalias = "m25p80"; > > + spi-max-frequency = <10000000>; > > + > > + partition@0 { > > + label = "u-boot"; > > + reg = <0x0 0x30000>; > > + read-only; > > + }; > > + > > + partition@30000 { > > + label = "u-boot-env"; > > + reg = <0x30000 0x10000>; > > + }; > > + > > + factory: partition@40000 { > > + label = "factory"; > > + reg = <0x40000 0x10000>; > > + read-only; > > + }; > > + > > + partition@50000 { > > + label = "firmware"; > > + reg = <0x50000 0x7b0000>; > > + }; > > + > > + partition@e30000 { > > + label = "recovery"; > > + reg = <0xe30000 0x1d0000>; > > + }; > > + > > + }; > > + }; > > + }; > > + > > + pcie@1e140000 { > > + status = "okay"; > > + > > + pcie0 { > > + mt76@0,0 { > > + reg = <0x0000 0 0 0 0>; > > + device_type = "pci"; > > + mediatek,mtd-eeprom = <&factory 0x8000>; > > + mediatek,2ghz = <0>; > > + }; > > + }; > > + > > + pcie1 { > > + mt76@1,0 { > > + reg = <0x0000 0 0 0 0>; > > + device_type = "pci"; > > + mediatek,mtd-eeprom = <&factory 0x0000>; > > + mediatek,5ghz = <0>; > > + }; > > + }; > > + }; > > + > > + ethernet@1e100000 { > > + mtd-mac-address = <&factory 0xe000>; > > + }; > > + > > + gpio-leds { > > + compatible = "gpio-leds"; > > + > > + wps { > > + label = "sk-wb8:green:wps"; > > + gpios = <&gpio1 14 1>; > > + }; > > + > > + usb { > > + label = "sk-wb8:green:usb"; > > + gpios = <&gpio1 15 1>; > > + }; > > + }; > > + > > + gpio-keys-polled { > > + compatible = "gpio-keys-polled"; > > + #address-cells = <1>; > > + #size-cells = <0>; > > + poll-interval = <20>; > > + wps { > > + label = "wps"; > > + gpios = <&gpio1 11 1>; > > + linux,code = <0x211>; > > + }; > > + reset { > > + label = "reset"; > > + gpios = <&gpio1 9 1>; > > + linux,code = <0x198>; > > + }; > > + }; > > + > > + pinctrl { > > + state_default: pinctrl0 { > > + gpio { > > + ralink,group = "i2c", "uart2", "uart3", > "rgmii2", "sdhci"; > > + ralink,function = "gpio"; > > + }; > > + }; > > + }; > > + > > +}; > > diff --git a/target/linux/ramips/image/mt7621.mk > b/target/linux/ramips/image/mt7621.mk > > index 1b8d3da..a09f4ab 100644 > > --- a/target/linux/ramips/image/mt7621.mk > > +++ b/target/linux/ramips/image/mt7621.mk > > @@ -138,6 +138,12 @@ define Device/ubnt-erx > > endef > > TARGET_DEVICES += ubnt-erx > > > > +define Device/sk-wb8 > > + DTS := SK-WB8 > > + IMAGE_SIZE := $(ralink_default_fw_size_16M) > > +endef > > +TARGET_DEVICES += sk-wb8 > > + > > # FIXME: is this still needed? > > define Image/Prepare > > #define Build/Compile > > diff --git a/target/linux/ramips/mt7621/profiles/sk-wb8.mk > b/target/linux/ramips/mt7621/profiles/sk-wb8.mk > > new file mode 100644 > > index 0000000..aa2e45e > > --- /dev/null > > +++ b/target/linux/ramips/mt7621/profiles/sk-wb8.mk > > @@ -0,0 +1,18 @@ > > +# > > +# Copyright (C) 2016 OpenWrt.org > > +# > > +# This is free software, licensed under the GNU General Public License > v2. > > +# See /LICENSE for more information. > > +# > > + > > +define Profile/SK-WB8 > > + NAME:=SamKnows Whitebox 8 > > + PACKAGES:=\ > > + kmod-usb-core kmod-usb3 \ > > + kmod-ledtrig-usbdev uboot-envtools > > +endef > > + > > +define Profile/SK-WB8/Description > > + Package set compatible with the SamKnows Whitebox 8. > > +endef > > +$(eval $(call Profile,SK-WB8)) > > _______________________________________________ > > openwrt-devel mailing list > > openwrt-devel@lists.openwrt.org > > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel >
diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips index a759bcc..9ad5974 100644 --- a/package/boot/uboot-envtools/files/ramips +++ b/package/boot/uboot-envtools/files/ramips @@ -24,7 +24,8 @@ linkits7688d | \ wsr-600 | \ wsr-1166 | \ br6425 | \ -miwifi-nano) +miwifi-nano | \ +sk-wb8) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x1000" "0x10000" ;; esac diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index 47e1e6a..28db48f 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -247,6 +247,9 @@ rt-n14u) set_wifi_led "$board:blue:air" set_usb_led "$board:blue:usb" ;; +sk-wb8) + set_usb_led "$board:green:usb" + ;; tiny-ac) set_wifi_led "$board:orange:wifi" set_usb_led "$board:green:usb" diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index ee690f6..3cbf577 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -77,6 +77,7 @@ ramips_setup_interfaces() pbr-m1|\ psg1208|\ sap-g3200u3|\ + sk-wb8|\ wf-2881|\ whr-300hp2|\ whr-600d|\ @@ -314,6 +315,9 @@ ramips_setup_macs() lan_mac=$(macaddr_setbit_la "$lan_mac") wan_mac=$(mtd_get_mac_binary factory 32772) ;; + sk-wb8) + wan_mac=$(mtd_get_mac_binary factory 57350) + ;; tew-691gr) lan_mac=$(cat /sys/class/net/eth0/address) wan_mac=$(macaddr_add "$lan_mac" 3) diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index c638d16..e432fa6 100644 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -79,6 +79,7 @@ get_status_led() { ;; awapn2403|\ dir-645|\ + sk-wb8|\ wrh-300cr) status_led="$board:green:wps" ;; diff --git a/target/linux/ramips/base-files/etc/init.d/bootcount b/target/linux/ramips/base-files/etc/init.d/bootcount new file mode 100755 index 0000000..b93e3c9 --- /dev/null +++ b/target/linux/ramips/base-files/etc/init.d/bootcount @@ -0,0 +1,11 @@ +#!/bin/sh /etc/rc.common +. /lib/ramips.sh + +START=99 + +start() { + local board=$(ramips_board_name) + if [ $board = "sk-wb8" ]; then + fw_setenv bootcount 0 + fi +} diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 0ac0f68..9d5421b 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -376,6 +376,9 @@ ramips_board_detect() { *"RUT5XX") name="rut5xx" ;; + *"SamKnows Whitebox 8") + name="sk-wb8" + ;; *"SAP-G3200U3") name="sap-g3200u3" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 86ea4a3..6036f73 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -112,6 +112,7 @@ platform_check_image() { rt-n56u|\ rut5xx|\ sap-g3200u3|\ + sk-wb8|\ sl-r7205|\ tew-691gr|\ tew-692gr|\ diff --git a/target/linux/ramips/dts/SK-WB8.dts b/target/linux/ramips/dts/SK-WB8.dts new file mode 100644 index 0000000..350cb4a --- /dev/null +++ b/target/linux/ramips/dts/SK-WB8.dts @@ -0,0 +1,127 @@ +/dts-v1/; + +#include "mt7621.dtsi" + +/ { + compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc"; + model = "SamKnows Whitebox 8"; + + memory@0 { + device_type = "memory"; + reg = <0x0 0x8000000>; + }; + + chosen { + bootargs = "console=ttyS0,57600"; + }; + + palmbus@1E000000 { + spi@b00 { + status = "okay"; + + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "mx25l6405d"; + reg = <0 0>; + linux,modalias = "m25p80"; + spi-max-frequency = <10000000>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x10000>; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + label = "firmware"; + reg = <0x50000 0x7b0000>; + }; + + partition@e30000 { + label = "recovery"; + reg = <0xe30000 0x1d0000>; + }; + + }; + }; + }; + + pcie@1e140000 { + status = "okay"; + + pcie0 { + mt76@0,0 { + reg = <0x0000 0 0 0 0>; + device_type = "pci"; + mediatek,mtd-eeprom = <&factory 0x8000>; + mediatek,2ghz = <0>; + }; + }; + + pcie1 { + mt76@1,0 { + reg = <0x0000 0 0 0 0>; + device_type = "pci"; + mediatek,mtd-eeprom = <&factory 0x0000>; + mediatek,5ghz = <0>; + }; + }; + }; + + ethernet@1e100000 { + mtd-mac-address = <&factory 0xe000>; + }; + + gpio-leds { + compatible = "gpio-leds"; + + wps { + label = "sk-wb8:green:wps"; + gpios = <&gpio1 14 1>; + }; + + usb { + label = "sk-wb8:green:usb"; + gpios = <&gpio1 15 1>; + }; + }; + + gpio-keys-polled { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + wps { + label = "wps"; + gpios = <&gpio1 11 1>; + linux,code = <0x211>; + }; + reset { + label = "reset"; + gpios = <&gpio1 9 1>; + linux,code = <0x198>; + }; + }; + + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; + ralink,function = "gpio"; + }; + }; + }; + +}; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 1b8d3da..a09f4ab 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -138,6 +138,12 @@ define Device/ubnt-erx endef TARGET_DEVICES += ubnt-erx +define Device/sk-wb8 + DTS := SK-WB8 + IMAGE_SIZE := $(ralink_default_fw_size_16M) +endef +TARGET_DEVICES += sk-wb8 + # FIXME: is this still needed? define Image/Prepare #define Build/Compile diff --git a/target/linux/ramips/mt7621/profiles/sk-wb8.mk b/target/linux/ramips/mt7621/profiles/sk-wb8.mk new file mode 100644 index 0000000..aa2e45e --- /dev/null +++ b/target/linux/ramips/mt7621/profiles/sk-wb8.mk @@ -0,0 +1,18 @@ +# +# Copyright (C) 2016 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/SK-WB8 + NAME:=SamKnows Whitebox 8 + PACKAGES:=\ + kmod-usb-core kmod-usb3 \ + kmod-ledtrig-usbdev uboot-envtools +endef + +define Profile/SK-WB8/Description + Package set compatible with the SamKnows Whitebox 8. +endef +$(eval $(call Profile,SK-WB8))
PATCHv1: This patch adds support for the SamKnows version 8.0 Whitebox, built around the MT7621 platform. 2.4GHz appears to be working, albeit poorly; 5GHz not working yet. PATCHv2: - Fixed LED name in DTS. PATCHv3: DTS: Syntax error fixed, LEDs and buttons mapped correctly now - diag.sh updated to blink WPS LED on boot - 2.4GHz wifi is working but txpower is stuck at 0, DTS ROM offset matches SamKnows firmware - 5GHz wifi not working, DTS pcie1,0 matches SamKnows firmware PATCHv4: - I didn't commit some fixes in PATCHv3, that's fixed now PATCHv5: - Added preinit hook to reset SamKnows Whitebox 8 u-boot boot counter to prevent soft brick by booting into nonexistent backup partition - Broke 2.4GHz WiFi but 5GHz sorta works (swapped pcie0/1 in DTS, needs further investigation, effective txpower is still 0) - Experimenting on wifi but that'll be a future patch, board boots fine now. PATCHv6: - Used init script to reset bootcount, preinit is too early to use fw-setenv PATCHv7: - Added model to sysupgrade. Tested thoroughly in general and I'm happy with this. Sorry for the many revisions. PATCHv8: - Added SamKnows recovery partition to partition table, in case someone specifically wants to send their bootloader to it - Fixed Wi-Fi by patching MT7602EN device ID (shows up as 7612) into mt76 kernel module (verified that signal strength on both bands is good, tested AP and STA modes PATCHv9: - Fixed LAN MAC address EEPROM offset - Fixed mt76 patch whitespace issues - Renamed mt76 patch to mt7602en to accurately reflect the physical chip it's supporting PATCHv10: - Removed mt76 patch in favor of upstream patch - I solemnly swear not to have to revision my patch >5 times every again Initial support for SamKnows Whitebox 8 Signed-off-by: Andrew Yong <me@ndoo.sg>