Re: [OpenWrt-Devel] [PATCHv10] ramips: Add support for SamKnows Whitebox 8
Noted. Would I need to re-send the same v10? On 29 Apr 2016 20:30, "Piotr Dymacz"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 : > > 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 > > > > 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" "0x1" > > ;; > > 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|\ > > +
Re: [OpenWrt-Devel] [PATCHv10] ramips: Add support for SamKnows Whitebox 8
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: > 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 > > 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" "0x1" > ;; > 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 000..b93e3c9 > --- /dev/null > +++ b/target/linux/ramips/base-files/etc/init.d/bootcount > @@
[OpenWrt-Devel] [PATCHv10] ramips: Add support for SamKnows Whitebox 8
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 Yongdiff --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" "0x1" ;; 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 000..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"