[OpenWrt-Devel] [PATCHv9] ramips: Add support for SamKnows Whitebox 8
Andrew Yong
me at ndoo.sg
Fri Apr 29 07:37:52 EDT 2016
Will do. Awesome.
On 29 Apr 2016 19:30, "John Crispin" <john at phrozen.org> wrote:
> Hi,
>
> please drop the mt76 part from the patch it is already merged in the
> mt76 tree on github and will hit trunk soon.
>
> also patch does not apply as shown below.
>
> John
>
> ../patchwork 615343
> --2016-04-28 09:07:34-- http://patchwork.ozlabs.org/patch/615343/mbox/
> Resolving patchwork.ozlabs.org (patchwork.ozlabs.org)... 103.22.144.67
> Connecting to patchwork.ozlabs.org
> (patchwork.ozlabs.org)|103.22.144.67|:80... connected.
> HTTP request sent, awaiting response... 200 OK
> Length: unspecified [text/plain]
> Saving to: `615343.patch'
>
> [ <=>
> ] 14,542 31.0K/s in 0.5s
>
> 2016-04-28 09:07:36 (31.0 KB/s) - `615343.patch' saved [14542]
>
> Applying: ramips: Add support for SamKnows Whitebox 8
> fatal: corrupt patch at line 22
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 ramips: Add support for SamKnows Whitebox 8
> When you have resolved this problem run "git am --resolved".
> If you would prefer to skip this patch, instead run "git am --skip".
> To restore the original branch and stop patching run "git am --abort".
> applying 615343 FAILED
>
>
>
>
> On 26/04/2016 23:47, Andrew Yong wrote:
> > 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
> >
> > Author: Andrew Yong <me at ndoo.sg>
> > Date: Wed Apr 27 05:40:26 2016 +0800
> >
> > Initial support for SamKnows Whitebox 8
> >
> > Signed-off-by: Andrew Yong <me at ndoo.sg>
> >
> > diff --git a/000-mt7602en.patch b/000-mt7602en.patch
> > new file mode 100644
> > index 0000000..e357bbb
> > --- /dev/null
> > +++ b/000-mt7602en.patch
> > @@ -0,0 +1,10 @@
> > +--- a/mt76x2_pci.c
> > ++++ b/mt76x2_pci.c
> > +@@ -20,6 +20,7 @@
> > +
> > + static const struct pci_device_id mt76pci_device_table[] = {
> > + { PCI_DEVICE(0x14c3, 0x7662) },
> > ++ { PCI_DEVICE(0x14c3, 0x7612) },
> > + { },
> > + };
> > +
> > 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 aeaab33..a47eacf 100755
> > --- a/target/linux/ramips/base-files/etc/board.d/01_leds
> > +++ b/target/linux/ramips/base-files/etc/board.d/01_leds
> > @@ -243,6 +243,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 c6c740f..4bc1d6e 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|\
> > @@ -313,6 +314,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 57344)
> > + ;;
> > 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 20ff8ff..e98226d 100644
> > --- a/target/linux/ramips/base-files/etc/diag.sh
> > +++ b/target/linux/ramips/base-files/etc/diag.sh
> > @@ -78,6 +78,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 2c669c5..f89e52d 100755
> > --- a/target/linux/ramips/base-files/lib/ramips.sh
> > +++ b/target/linux/ramips/base-files/lib/ramips.sh
> > @@ -373,6 +373,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 2b24030..4e5cb07 100755
> > --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
> > +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
> > @@ -111,6 +111,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 at 0 {
> > + device_type = "memory";
> > + reg = <0x0 0x8000000>;
> > + };
> > +
> > + chosen {
> > + bootargs = "console=ttyS0,57600";
> > + };
> > +
> > + palmbus at 1E000000 {
> > + spi at b00 {
> > + status = "okay";
> > +
> > + m25p80 at 0 {
> > + #address-cells = <1>;
> > + #size-cells = <1>;
> > + compatible = "mx25l6405d";
> > + reg = <0 0>;
> > + linux,modalias = "m25p80";
> > + spi-max-frequency = <10000000>;
> > +
> > + partition at 0 {
> > + label = "u-boot";
> > + reg = <0x0 0x30000>;
> > + read-only;
> > + };
> > +
> > + partition at 30000 {
> > + label = "u-boot-env";
> > + reg = <0x30000 0x10000>;
> > + };
> > +
> > + factory: partition at 40000 {
> > + label = "factory";
> > + reg = <0x40000 0x10000>;
> > + read-only;
> > + };
> > +
> > + partition at 50000 {
> > + label = "firmware";
> > + reg = <0x50000 0x7b0000>;
> > + };
> > +
> > + partition at e30000 {
> > + label = "recovery";
> > + reg = <0xe30000 0x1d0000>;
> > + };
> > +
> > + };
> > + };
> > + };
> > +
> > + pcie at 1e140000 {
> > + status = "okay";
> > +
> > + pcie0 {
> > + mt76 at 0,0 {
> > + reg = <0x0000 0 0 0 0>;
> > + device_type = "pci";
> > + mediatek,mtd-eeprom = <&factory 0x8000>;
> > + mediatek,2ghz = <0>;
> > + };
> > + };
> > +
> > + pcie1 {
> > + mt76 at 1,0 {
> > + reg = <0x0000 0 0 0 0>;
> > + device_type = "pci";
> > + mediatek,mtd-eeprom = <&factory 0x0000>;
> > + mediatek,5ghz = <0>;
> > + };
> > + };
> > + };
> > +
> > + ethernet at 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 at lists.openwrt.org
> > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
> >
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.infradead.org/pipermail/openwrt-devel/attachments/20160429/77bca2a4/attachment.htm>
-------------- next part --------------
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
More information about the openwrt-devel
mailing list